Implement DISALLOW_COPY_AND_ASSIGN using =delete, stage two.

base/macros.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains macros and macro-like constructs (e.g., templates) that
 // are commonly used throughout Chromium source. (It may also contain things
 // that are closely related to things that are commonly used that belong in this
 // file.)
 
 #ifndef BASE_MACROS_H_
 #define BASE_MACROS_H_
 
 #include <stddef.h>  // For size_t.
 
-#include "build/build_config.h"  // For OS_XXX.  TODO(pkasting): Remove.
-
 // Put this in the declarations for a class to be uncopyable.
 #define DISALLOW_COPY(TypeName) \
   TypeName(const TypeName&) = delete
 
 // Put this in the declarations for a class to be unassignable.
 #define DISALLOW_ASSIGN(TypeName) \
   void operator=(const TypeName&) = delete
 
 // A macro to disallow the copy constructor and operator= functions.
 // This should be used in the private: declarations for a class.
-// TODO(pkasting): Using "= delete" is Linux-specific initially to prevent
-// cross-platform code from regressing while other platforms are fixed.  Remove
-// the ifdefs here and use "= delete" on all platforms.
-#if defined(CHROMIUM_BUILD) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
+// TODO(pkasting): Using "= delete" is non-branded-build-specific initially to
+// limit the rollout to reduce the chance of build breakage.  Remove the ifdef
+// here and use "= delete" always.
+#if defined(CHROMIUM_BUILD)
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&) = delete;      \
   void operator=(const TypeName&) = delete
 #else
 #define DISALLOW_COPY_AND_ASSIGN(TypeName) \
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 #endif
 
 // A macro to disallow all the implicit constructors, namely the
@@ skipping 48 matching lines @@
 
 // Use these to declare and define a static local variable (static T;) so that
 // it is leaked so that its destructors are not called at exit. If you need
 // thread-safe initialization, use base/lazy_instance.h instead.
 #define CR_DEFINE_STATIC_LOCAL(type, name, arguments) \
   static type& name = *new type arguments
 
 }  // base
 
 #endif  // BASE_MACROS_H_