Consolidate constructormagic macros with Chromium version and remove Chromium override.

webrtc/base/constructormagic.h

Index: webrtc/base/constructormagic.h
diff --git a/webrtc/base/constructormagic.h b/webrtc/base/constructormagic.h
index 6b1244fc6457e177f568d2a19c1e9e1f28502b00..6971580507c0b6475e31075fb419f434beac8fb7 100644
--- a/webrtc/base/constructormagic.h
+++ b/webrtc/base/constructormagic.h
@@ -14,27 +14,27 @@
 // Undefine macros first, just in case. Some third-party includes have their own
 // version.
 
+// Put this in the declarations for a class to be unassignable.
 #undef DISALLOW_ASSIGN
 #define DISALLOW_ASSIGN(TypeName) \
-  void operator=(const TypeName&)
+  void operator=(const TypeName&) = delete
 
-// A macro to disallow the evil copy constructor and operator= functions
-// This should be used in the private: declarations for a class.
+// A macro to disallow the copy constructor and operator= functions. This should
+// be used in the declarations for a class.
 #undef DISALLOW_COPY_AND_ASSIGN
-#define DISALLOW_COPY_AND_ASSIGN(TypeName)    \
-  TypeName(const TypeName&);                    \
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
+  TypeName(const TypeName&) = delete;      \
   DISALLOW_ASSIGN(TypeName)
 
-// A macro to disallow all the implicit constructors, namely the
-// default constructor, copy constructor and operator= functions.
+// A macro to disallow all the implicit constructors, namely the default
+// constructor, copy constructor and operator= functions.
 //
-// This should be used in the private: declarations for a class
-// that wants to prevent anyone from instantiating it. This is
-// especially useful for classes containing only static methods.
+// This should be used in the declarations for a class that wants to prevent
+// anyone from instantiating it. This is especially useful for classes
+// containing only static methods.
 #undef DISALLOW_IMPLICIT_CONSTRUCTORS
 #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName();                                    \
+  TypeName() = delete;                           \
   DISALLOW_COPY_AND_ASSIGN(TypeName)
 
-
 #endif  // WEBRTC_BASE_CONSTRUCTORMAGIC_H_