base: Make ScopedPtrMap use DISALLOW_COPY_AND_ASSIGN.

base/containers/scoped_ptr_map.h

Index: base/containers/scoped_ptr_map.h
diff --git a/base/containers/scoped_ptr_map.h b/base/containers/scoped_ptr_map.h
index 822cbfd0ebd12a215d967c9aa582cacc21cd8344..25538b95849d47e96531130dbcc85e1b679ed6a4 100644
--- a/base/containers/scoped_ptr_map.h
+++ b/base/containers/scoped_ptr_map.h
@@ -10,8 +10,8 @@
 #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 {
@@ -27,10 +27,7 @@ namespace base {
 // 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;
@@ -140,6 +137,8 @@ class ScopedPtrMap {
       return data_.end();
     return data_.find(it->first);
   };
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedPtrMap);
 };
 
 }  // namespace base