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

webrtc/api/peerconnectionfactoryproxy.h

 /*
  *  Copyright 2014 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_API_PEERCONNECTIONFACTORYPROXY_H_
 #define WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/proxy.h"
 #include "webrtc/base/bind.h"
 
 namespace webrtc {
 
 BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
+  PROXY_SIGNALING_THREAD_DESTRUCTOR()
   PROXY_METHOD1(void, SetOptions, const Options&)
   // Can't use PROXY_METHOD5 because unique_ptr must be moved.
   // TODO(tommi,hbos): Use of templates to support unique_ptr?
   rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
       const PeerConnectionInterface::RTCConfiguration& a1,
       const MediaConstraintsInterface* a2,
       std::unique_ptr<cricket::PortAllocator> a3,
       std::unique_ptr<rtc::RTCCertificateGeneratorInterface> a4,
       PeerConnectionObserver* a5) override {
     return signaling_thread_
@@ skipping 57 matching lines @@
   rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
       const PeerConnectionInterface::RTCConfiguration& a1,
       cricket::PortAllocator* a3,
       rtc::RTCCertificateGeneratorInterface* a4,
       PeerConnectionObserver* a5) {
     std::unique_ptr<cricket::PortAllocator> ptr_a3(a3);
     std::unique_ptr<rtc::RTCCertificateGeneratorInterface> ptr_a4(a4);
     return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
                                     a5);
   }
-  END_SIGNALING_PROXY()
+  END_PROXY_MAP()

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

It seems like the end should match the begin.  So would END_SIGNALING_PROXY_MAP
be a better name, even if it's just an alias of END_PROXY_MAP?

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

I don't see much benefit to that. Plus, code would then compile if you match
"BEGIN_SIGNALING_PROXY_MAP" with "END_WORKER_PROXY_MAP".

 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_PEERCONNECTIONFACTORYPROXY_H_