From f7a5335ca5f154100a479d2feeef1c465e159bd0 Mon Sep 17 00:00:00 2001
From: solenberg <solenberg@webrtc.org>
Date: Wed, 31 Aug 2016 05:18:22 -0700
Subject: [PATCH] Remove fakewebrtccommon.h.

BUG=webrtc:4690

Review-Url: https://codereview.webrtc.org/1583773006
Cr-Commit-Position: refs/heads/master@{#13993}
---
 webrtc/media/BUILD.gn                       |  1 -
 webrtc/media/engine/fakewebrtccommon.h      | 42 ---------------------
 webrtc/media/engine/fakewebrtcvoiceengine.h | 21 ++++++++++-
 webrtc/media/media.gyp                      |  1 -
 4 files changed, 19 insertions(+), 46 deletions(-)
 delete mode 100644 webrtc/media/engine/fakewebrtccommon.h

diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 0014e2d615..78e7f78f4d 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -243,7 +243,6 @@ if (rtc_include_tests) {
       "base/testutils.h",
       "engine/fakewebrtccall.cc",
       "engine/fakewebrtccall.h",
-      "engine/fakewebrtccommon.h",
       "engine/fakewebrtcdeviceinfo.h",
       "engine/fakewebrtcvcmfactory.h",
       "engine/fakewebrtcvideocapturemodule.h",
diff --git a/webrtc/media/engine/fakewebrtccommon.h b/webrtc/media/engine/fakewebrtccommon.h
deleted file mode 100644
index 5c13c1bc52..0000000000
--- a/webrtc/media/engine/fakewebrtccommon.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (c) 2011 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.
- */
-
-#ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_
-#define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_
-
-#include "webrtc/base/common.h"
-
-namespace cricket {
-
-#define WEBRTC_STUB(method, args) \
-  int method args override { return 0; }
-
-#define WEBRTC_STUB_CONST(method, args) \
-  int method args const override { return 0; }
-
-#define WEBRTC_BOOL_STUB(method, args) \
-  bool method args override { return true; }
-
-#define WEBRTC_BOOL_STUB_CONST(method, args) \
-  bool method args const override { return true; }
-
-#define WEBRTC_VOID_STUB(method, args) \
-  void method args override {}
-
-#define WEBRTC_FUNC(method, args) int method args override
-
-#define WEBRTC_FUNC_CONST(method, args) int method args const override
-
-#define WEBRTC_BOOL_FUNC(method, args) bool method args override
-
-#define WEBRTC_VOID_FUNC(method, args) void method args override
-}  // namespace cricket
-
-#endif  // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCCOMMON_H_
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h
index c8fb9cfe02..9b5440c17b 100644
--- a/webrtc/media/engine/fakewebrtcvoiceengine.h
+++ b/webrtc/media/engine/fakewebrtcvoiceengine.h
@@ -17,12 +17,10 @@
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/config.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/engine/fakewebrtccommon.h"
 #include "webrtc/media/engine/webrtcvoe.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -38,6 +36,25 @@ static const int kOpusBandwidthFb = 20000;
 #define WEBRTC_CHECK_CHANNEL(channel) \
   if (channels_.find(channel) == channels_.end()) return -1;
 
+#define WEBRTC_STUB(method, args) \
+  int method args override { return 0; }
+
+#define WEBRTC_STUB_CONST(method, args) \
+  int method args const override { return 0; }
+
+#define WEBRTC_BOOL_STUB(method, args) \
+  bool method args override { return true; }
+
+#define WEBRTC_BOOL_STUB_CONST(method, args) \
+  bool method args const override { return true; }
+
+#define WEBRTC_VOID_STUB(method, args) \
+  void method args override {}
+
+#define WEBRTC_FUNC(method, args) int method args override
+
+#define WEBRTC_VOID_FUNC(method, args) void method args override
+
 class FakeAudioProcessing : public webrtc::AudioProcessing {
  public:
   FakeAudioProcessing() : experimental_ns_enabled_(false) {}
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index ecd0a769c5..c9482262d9 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -244,7 +244,6 @@
             'base/testutils.h',
             'engine/fakewebrtccall.cc',
             'engine/fakewebrtccall.h',
-            'engine/fakewebrtccommon.h',
             'engine/fakewebrtcdeviceinfo.h',
             'engine/fakewebrtcvcmfactory.h',
             'engine/fakewebrtcvideocapturemodule.h',