Remove overridden basictypes.h.

talk/media/base/cpuid.h

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef TALK_MEDIA_BASE_CPUID_H_
 #define TALK_MEDIA_BASE_CPUID_H_
 
-#include "webrtc/base/basictypes.h"  // For RTC_DISALLOW_IMPLICIT_CONSTRUCTORS
+#include "webrtc/base/constructormagic.h"
 
 namespace cricket {
 
 class CpuInfo {
  public:
   // The following flags must match libyuv/cpu_id.h values.
   // Internal flag to indicate cpuid requires initialization.
   static const int kCpuInit = 0x1;
 
   // These flags are only valid on ARM processors.
@@ skipping 25 matching lines @@
  private:
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CpuInfo);
 };
 
 // Detect an Intel Core I5 or better such as 4th generation Macbook Air.
 bool IsCoreIOrBetter();
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_CPUID_H_