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

webrtc/base/natserver.h

 /*
  *  Copyright 2004 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 91 matching lines @@
   typedef std::map<SocketAddressPair, TransEntry*, RouteCmp> InternalMap;
   typedef std::map<SocketAddress, TransEntry*> ExternalMap;
 
   /* Creates a new entry that translates the given route. */
   void Translate(const SocketAddressPair& route);
 
   /* Determines whether the NAT would filter out a packet from this address. */
   bool ShouldFilterOut(TransEntry* entry, const SocketAddress& ext_addr);
 
   NAT* nat_;
+  SocketFactory* internal_;
   SocketFactory* external_;
   SocketAddress external_ip_;
   AsyncUDPSocket* udp_server_socket_;
   ProxyServer* tcp_proxy_server_;
   InternalMap* int_map_;
   ExternalMap* ext_map_;
   DISALLOW_COPY_AND_ASSIGN(NATServer);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_NATSERVER_H_