Rename MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03

base/scoped_generic.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.
 
 #ifndef BASE_SCOPED_GENERIC_H_
 #define BASE_SCOPED_GENERIC_H_
 
 #include <stdlib.h>
 
 #include <algorithm>
@@ skipping 35 matching lines @@
 //
 //     // This free function will not be called if f == InvalidValue()!
 //     static void Free(int f) {
 //       ::FreeFoo(f);
 //     }
 //   };
 //
 //   typedef ScopedGeneric<int, FooScopedTraits> ScopedFoo;
 template<typename T, typename Traits>
 class ScopedGeneric {
-  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(ScopedGeneric)
+  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(ScopedGeneric)
 
  private:
   // This must be first since it's used inline below.
   //
   // Use the empty base class optimization to allow us to have a D
   // member, while avoiding any space overhead for it when D is an
   // empty class.  See e.g. http://www.cantrip.org/emptyopt.html for a good
   // discussion of this technique.
   struct Data : public Traits {
     explicit Data(const T& in) : generic(in) {}
@@ skipping 106 matching lines @@
 }
 
 template<class T, class Traits>
 bool operator!=(const T& value, const ScopedGeneric<T, Traits>& scoped) {
   return value != scoped.get();
 }
 
 }  // namespace base
 
 #endif  // BASE_SCOPED_GENERIC_H_