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

ui/gfx/image/image.cc

Index: ui/gfx/image/image.cc
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index d9e51e87b3cebc044563b694c7847e9d3e2f6c73..2e0297ac222d275aadf0d00f32bdc50455ec69ac 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -743,13 +743,13 @@ internal::ImageRep* Image::GetRepresentation(
     CHECK(!must_exist);
     return NULL;
   }
-  return it->second;
+  return it->second.get();
 }
 
 void Image::AddRepresentation(scoped_ptr<internal::ImageRep> rep) const {
   CHECK(storage_.get());
   RepresentationType type = rep->type();
-  storage_->representations().insert(type, rep.Pass());
+  storage_->representations().insert(std::make_pair(type, std::move(rep)));
 }
 
 }  // namespace gfx