Update usages of std::map to use ScopedPtrMap.

ui/gfx/image/image.cc

 // 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.
 
 #include "ui/gfx/image/image.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/logging.h"
-#include "base/stl_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_source.h"
 
 #if !defined(OS_IOS)
 #include "ui/gfx/codec/png_codec.h"
 #endif
 
@@ skipping 311 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ImageRepCocoa);
 };
 #endif  // defined(OS_MACOSX)
 
 // The Storage class acts similarly to the pixels in a SkBitmap: the Image
 // class holds a refptr instance of Storage, which in turn holds all the
 // ImageReps. This way, the Image can be cheaply copied.
 class ImageStorage : public base::RefCounted<ImageStorage> {
  public:
   ImageStorage(Image::RepresentationType default_type)
-      : default_representation_type_(default_type),
+      : default_representation_type_(default_type)
 #if defined(OS_MACOSX) && !defined(OS_IOS)
+        ,
         default_representation_color_space_(
-            base::mac::GetGenericRGBColorSpace()),
+            base::mac::GetGenericRGBColorSpace())
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
-        representations_deleter_(&representations_) {
+  {
   }
 
   Image::RepresentationType default_representation_type() {
     return default_representation_type_;
   }
   Image::RepresentationMap& representations() { return representations_; }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   void set_default_representation_color_space(CGColorSpaceRef color_space) {
     default_representation_color_space_ = color_space;
@@ skipping 17 matching lines @@
   // NSImage. This field exists to compensate for PNGCodec not writing or
   // reading colorspace ancillary chunks. (sRGB, iCCP).
   // Not owned.
   CGColorSpaceRef default_representation_color_space_;
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
   // All the representations of an Image. Size will always be at least one, with
   // more for any converted representations.
   Image::RepresentationMap representations_;
 
-  STLValueDeleter<Image::RepresentationMap> representations_deleter_;
-
   DISALLOW_COPY_AND_ASSIGN(ImageStorage);
 };
 
 }  // namespace internal
 
 Image::Image() {
   // |storage_| is NULL for empty Images.
 }
 
 Image::Image(const std::vector<ImagePNGRep>& image_reps) {
@@ skipping 334 matching lines @@
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 Image::RepresentationType Image::DefaultRepresentationType() const {
   CHECK(storage_.get());
   return storage_->default_representation_type();
 }
 
 internal::ImageRep* Image::GetRepresentation(
     RepresentationType rep_type, bool must_exist) const {
   CHECK(storage_.get());
-  RepresentationMap::iterator it = storage_->representations().find(rep_type);
+  RepresentationMap::const_iterator it =
+      storage_->representations().find(rep_type);
   if (it == storage_->representations().end()) {
     CHECK(!must_exist);
     return NULL;
   }
   return it->second;
 }
 
 void Image::AddRepresentation(scoped_ptr<internal::ImageRep> rep) const {
   CHECK(storage_.get());
   RepresentationType type = rep->type();
-  storage_->representations().insert(std::make_pair(type, rep.release()));
+  storage_->representations().insert(type, rep.Pass());
 }
 
 }  // namespace gfx