Adding some features to proxy.h, and restructuring the macros.

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 45 matching lines @@
 
   MOCK_METHOD2(Method2, std::string(std::string, std::string));
 
  protected:
   Fake() {}
   ~Fake() {}
 };
 
 // Proxies for the test interface.
 BEGIN_PROXY_MAP(Fake)
+  PROXY_SIGNALING_THREAD_DESTRUCTOR()
   PROXY_METHOD0(void, VoidMethod0)
   PROXY_METHOD0(std::string, Method0)
   PROXY_CONSTMETHOD0(std::string, ConstMethod0)
   PROXY_WORKER_METHOD1(std::string, Method1, std::string)
   PROXY_CONSTMETHOD1(std::string, ConstMethod1, std::string)
   PROXY_WORKER_METHOD2(std::string, Method2, std::string, std::string)
-END_PROXY()
+END_PROXY_MAP()
 
 // Preprocessor hack to get a proxy class a name different than FakeProxy.
 #define FakeProxy FakeSignalingProxy
 #define FakeProxyWithInternal FakeSignalingProxyWithInternal
 BEGIN_SIGNALING_PROXY_MAP(Fake)
+  PROXY_SIGNALING_THREAD_DESTRUCTOR()
   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_SIGNALING_PROXY()
+END_PROXY_MAP()
 #undef FakeProxy
 
 class SignalingProxyTest : public testing::Test {

[pthatcher1, 2017/01/17 19:44:00]

Is there a test of the new functionality you are adding?

[Taylor Brandstetter, 2017/01/18 01:17:14]

Done. I only added a smoke test for the "owned proxy", since it can be assumed
that if one type of method works the others will work the same way.

  public:
   // Checks that the functions are called on the right thread.
   void CheckSignalingThread() { EXPECT_TRUE(signaling_thread_->IsCurrent()); }
 
  protected:
   void SetUp() override {
     signaling_thread_.reset(new rtc::Thread());
     ASSERT_TRUE(signaling_thread_->Start());
     fake_ = Fake::Create();
     fake_signaling_proxy_ =
@@ skipping 132 matching lines @@
   const std::string arg1 = "arg1";
   const std::string arg2 = "arg2";
   EXPECT_CALL(*fake_, Method2(arg1, arg2))
       .Times(Exactly(1))
       .WillOnce(DoAll(InvokeWithoutArgs(this, &ProxyTest::CheckWorkerThread),
                       Return("Method2")));
   EXPECT_EQ("Method2", fake_proxy_->Method2(arg1, arg2));
 }
 
 }  // namespace webrtc