Consolidate constructormagic macros with Chromium version and remove Chromium override.

webrtc/base/constructormagic.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_CONSTRUCTORMAGIC_H_
 #define WEBRTC_BASE_CONSTRUCTORMAGIC_H_
 
 // 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&) = delete

[tommi, 2015/09/07 11:15:27]

nit: 4 spaces?

[Henrik Grunell WebRTC, 2015/09/07 11:56:40]

2 spaces in base/macros.h.

+
+// A macro to disallow the copy constructor and operator= functions
+// This should be used in the private: declarations for a class
+#undef DISALLOW_COPY_AND_ASSIGN
+#define DISALLOW_COPY_AND_ASSIGN(TypeName) \

[Andrew MacDonald, 2015/09/07 22:45:36]

Any reason not to fix this one as well?

TypeName(const TypeName&) = delete;
DISALLOW_ASSIGN(TypeName)

If so, remove "private: " above.

[Henrik Grunell WebRTC, 2015/09/08 11:41:09]

Ah, good catch. It's like this in Chromium because it's redefined in some
places. That's not the case in WebRTC. Done.

+  TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
-// A macro to disallow the evil copy constructor and operator= functions
-// This should be used in the private: declarations for a class.
-#undef DISALLOW_COPY_AND_ASSIGN
-#define DISALLOW_COPY_AND_ASSIGN(TypeName)    \
-  TypeName(const TypeName&);                    \
-  DISALLOW_ASSIGN(TypeName)
-
 // 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

[Andrew MacDonald, 2015/09/07 22:45:36]

Remove "private: ".

[Henrik Grunell WebRTC, 2015/09/08 11:41:09]

Done.

 // 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_