Remove overridden basictypes.h.

talk/media/base/yuvframegenerator.h

 /*
  * libjingle
  * Copyright 2010 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 22 matching lines @@
 // There is also a solid box bouncing around in the Y-plane, and two differently
 // coloured lines bouncing horizontally and vertically in the U and V plane.
 // This helps illustrating how the frame boundary goes, and can aid as a quite
 // handy visual help for noticing e.g. packet loss if the frames are encoded
 // and sent over the network.
 
 #ifndef TALK_MEDIA_BASE_YUVFRAMEGENERATOR_H_
 #define TALK_MEDIA_BASE_YUVFRAMEGENERATOR_H_
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace cricket {
 
 class YuvFrameGenerator {
  public:
   // Constructs a frame-generator that produces frames of size |width|x|height|.
   // If |enable_barcode| is specified, barcodes can be included in the frames
   // when calling |GenerateNextFrame(uint8*, uint32)|. If |enable_barcode| is
   // |true| then |width|x|height| should be at least 160x100; otherwise this
   // constructor will abort.
@@ skipping 43 matching lines @@
 
   int barcode_start_x_;
   int barcode_start_y_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(YuvFrameGenerator);
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_YUVFRAMEGENERATOR_H_