Revert of Consolidate constructormagic macros with Chromium version and remove Chromium override.

talk/app/webrtc/videosource.cc

 /*
  * libjingle
  * Copyright 2012 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 300 matching lines @@
 
     // This signal will be made on media engine render thread. The clients
     // of this signal should have no assumptions on what thread this signal
     // come from.
     capturer_->SignalVideoFrame(capturer_, frame);
     return true;
   }
 
  private:
   cricket::VideoCapturer* capturer_;
+  int width_;
+  int height_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameInputWrapper);
 };
 
 }  // anonymous namespace
 
 namespace webrtc {
 
 rtc::scoped_refptr<VideoSource> VideoSource::Create(
     cricket::ChannelManager* channel_manager,
@@ skipping 129 matching lines @@
 }
 
 void VideoSource::SetState(SourceState new_state) {
   if (VERIFY(state_ != new_state)) {
     state_ = new_state;
     FireOnChanged();
   }
 }
 
 }  // namespace webrtc