ScopedPtrMap -> std::map from /ui/gfx/image

ui/gfx/image/image.h

 // Copyright (c) 2012 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.
 
 // An Image wraps an image any flavor, be it platform-native GdkBitmap/NSImage,
 // or a SkBitmap. This also provides easy conversion to other image types
 // through operator overloading. It will cache the converted representations
 // internally to prevent double-conversion.
 //
 // The lifetime of both the initial representation and any converted ones are
 // tied to the lifetime of the Image's internal storage. To allow Images to be
 // cheaply passed around by value, the actual image data is stored in a ref-
 // counted member. When all Images referencing this storage are deleted, the
 // actual representations are deleted, too.
 //
 // Images can be empty, in which case they have no backing representation.
 // Attempting to use an empty Image will result in a crash.
 
 #ifndef UI_GFX_IMAGE_IMAGE_H_
 #define UI_GFX_IMAGE_IMAGE_H_
 
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/containers/scoped_ptr_map.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 typedef struct CGColorSpace* CGColorSpaceRef;
 #endif
 
 class SkBitmap;
@@ skipping 10 matching lines @@
 
 class GFX_EXPORT Image {
  public:
   enum RepresentationType {
     kImageRepCocoa,
     kImageRepCocoaTouch,
     kImageRepSkia,
     kImageRepPNG,
   };
 
-  typedef base::ScopedPtrMap<RepresentationType, scoped_ptr<internal::ImageRep>>
-      RepresentationMap;
+  using RepresentationMap =
+      std::map<RepresentationType, scoped_ptr<internal::ImageRep>>;
 
   // Creates an empty image with no representations.
   Image();
 
   // Creates a new image by copying the raw PNG-encoded input for use as the
   // default representation.
   explicit Image(const std::vector<ImagePNGRep>& image_reps);
 
   // Creates a new image by copying the ImageSkia for use as the default
   // representation.
@@ skipping 117 matching lines @@
   void AddRepresentation(scoped_ptr<internal::ImageRep> rep) const;
 
   // Internal class that holds all the representations. This allows the Image to
   // be cheaply copied.
   scoped_refptr<internal::ImageStorage> storage_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_H_