Consolidate constructormagic macros with Chromium version and remove Chromium override.

webrtc/base/socket.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.
  */
 
 #ifndef WEBRTC_BASE_SOCKET_H__
 #define WEBRTC_BASE_SOCKET_H__
 
 #include <errno.h>
 
 #if defined(WEBRTC_POSIX)
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #define SOCKET_EACCES EACCES
 #endif
 
 #if defined(WEBRTC_WIN)
 #include "webrtc/base/win32.h"
 #endif
 
 #include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/socketaddress.h"
 
 // Rather than converting errors into a private namespace,
 // Reuse the POSIX socket api errors. Note this depends on
 // Win32 compatibility.
 
 #if defined(WEBRTC_WIN)
 #undef EWOULDBLOCK  // Remove errno.h's definition for each macro below.
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #undef EINPROGRESS
@@ skipping 140 matching lines @@
  protected:
   Socket() {}
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(Socket);
 };
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_SOCKET_H__