Rename BEGIN_PROXY_MAP --> BEGIN_SIGNALLING_PROXY_MAP.

webrtc/api/proxy_unittest.cc

 /*
  *  Copyright 2013 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 23 matching lines @@
   virtual std::string ConstMethod0() const = 0;
   virtual std::string Method1(std::string s) = 0;
   virtual std::string ConstMethod1(std::string s) const = 0;
   virtual std::string Method2(std::string s1, std::string s2) = 0;
 
  protected:
   ~FakeInterface() {}
 };
 
 // Proxy for the test interface.
-BEGIN_PROXY_MAP(Fake)
+BEGIN_SIGNALLING_PROXY_MAP(Fake)
   PROXY_METHOD0(void, VoidMethod0)
   PROXY_METHOD0(std::string, Method0)
   PROXY_CONSTMETHOD0(std::string, ConstMethod0)
   PROXY_METHOD1(std::string, Method1, std::string)
   PROXY_CONSTMETHOD1(std::string, ConstMethod1, std::string)
   PROXY_METHOD2(std::string, Method2, std::string, std::string)
-END_PROXY()
+END_SIGNALLING_PROXY()
 
 // Implementation of the test interface.
 class Fake : public FakeInterface {
  public:
   static rtc::scoped_refptr<Fake> Create() {
     return new rtc::RefCountedObject<Fake>();
   }
 
   MOCK_METHOD0(VoidMethod0, void());
   MOCK_METHOD0(Method0, std::string());
   MOCK_CONST_METHOD0(ConstMethod0, std::string());
 
   MOCK_METHOD1(Method1, std::string(std::string));
   MOCK_CONST_METHOD1(ConstMethod1, std::string(std::string));
 
   MOCK_METHOD2(Method2, std::string(std::string, std::string));
 
  protected:
   Fake() {}
   ~Fake() {}
 };
 
 class ProxyTest: public testing::Test {

[perkj_webrtc, 2016/04/11 10:41:55]

Add test for the worker thread and the new worker proxy as well please.

  public:
   // Checks that the functions is called on the |signaling_thread_|.
   void CheckThread() {
     EXPECT_EQ(rtc::Thread::Current(), signaling_thread_.get());
   }
 
  protected:
   virtual void SetUp() {
     signaling_thread_.reset(new rtc::Thread());
     ASSERT_TRUE(signaling_thread_->Start());
@@ skipping 59 matching lines @@
   const std::string arg2 = "arg2";
   EXPECT_CALL(*fake_, Method2(arg1, arg2))
             .Times(Exactly(1))
             .WillOnce(
                 DoAll(InvokeWithoutArgs(this, &ProxyTest::CheckThread),
                       Return("Method2")));
   EXPECT_EQ("Method2", fake_proxy_->Method2(arg1, arg2));
 }
 
 }  // namespace webrtc