base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN.

base/containers/scoped_ptr_map.h

 // Copyright 2015 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_CONTAINERS_SCOPED_PTR_MAP_H_
 #define BASE_CONTAINERS_SCOPED_PTR_MAP_H_
 
 #include <functional>
 #include <map>
 #include <utility>
 
 #include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/move.h"
 #include "base/stl_util.h"
 
 namespace base {
 
 // ScopedPtrMap provides a std::map that supports scoped_ptr values. It ensures
 // that the map's values are properly deleted when removed from the map, or when
 // the map is destroyed.
 //
 // |ScopedPtr| must be a type scoped_ptr<T>. This is for compatibility with
 // std::map in C++11.
 //
 // TODO(http://crbug.com/554291): DEPRECATED: Use std::map instead (now that we
 // have support for moveable types inside containers).
 template <class Key, class ScopedPtr, class Compare = std::less<Key>>
 class ScopedPtrMap {
-  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(ScopedPtrMap)
-
   using Container = std::map<Key, typename ScopedPtr::element_type*, Compare>;
-
  public:
   using allocator_type = typename Container::allocator_type;
   using size_type = typename Container::size_type;
   using difference_type = typename Container::difference_type;
   using reference = typename Container::reference;
   using const_reference = typename Container::const_reference;
   using key_type = typename Container::key_type;
   using mapped_type = ScopedPtr;
   using key_compare = typename Container::key_compare;
   using const_iterator = typename Container::const_iterator;
@@ skipping 89 matching lines @@
  private:
   Container data_;
 
   typename Container::iterator ConstIteratorToIterator(const_iterator it) {
     // This is the only way to convert a const iterator to a non-const iterator
     // in C++03 (get the key and do the lookup again).
     if (it == data_.end())
       return data_.end();
     return data_.find(it->first);
   };
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedPtrMap);
 };
 
 }  // namespace base
 
 #endif  // BASE_CONTAINERS_SCOPED_PTR_MAP_H_