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

webrtc/modules/video_coding/main/test/test_util.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 43 matching lines @@
 class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
  public:
   FileOutputFrameReceiver(const std::string& base_out_filename, uint32_t ssrc);
   virtual ~FileOutputFrameReceiver();
 
   // VCMReceiveCallback
   virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame);
 
  private:
   std::string out_filename_;
+  uint32_t ssrc_;
   FILE* out_file_;
   FILE* timing_file_;
   int width_;
   int height_;
   int count_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver);
 };
 
 class CmdArgs {
  public:
   CmdArgs();
 
   std::string codecName;
   webrtc::VideoCodecType codecType;
   int width;
   int height;
   int rtt;
   std::string inputFile;
   std::string outputFile;
 };
 
 #endif