gfx::Image: Refactor to avoid assuming scoped_ptr lifetime.

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 <utility>
 
@@ skipping 492 matching lines @@
             GetRepresentation(kImageRepCocoa, true)->AsImageRepCocoa();
         scoped_rep.reset(new internal::ImageRepSkia(
             new ImageSkia(ImageSkiaFromNSImage(native_rep->image()))));
         break;
       }
 #endif
       default:
         NOTREACHED();
     }
     CHECK(scoped_rep);
-    rep = scoped_rep.get();
-    AddRepresentation(std::move(scoped_rep));
+    rep = AddRepresentation(std::move(scoped_rep));
   }
   return rep->AsImageRepSkia()->image();
 }
 
 #if defined(OS_IOS)
 UIImage* Image::ToUIImage() const {
   internal::ImageRep* rep = GetRepresentation(kImageRepCocoaTouch, false);
   if (!rep) {
     scoped_ptr<internal::ImageRep> scoped_rep;
     switch (DefaultRepresentationType()) {
       case kImageRepPNG: {
         internal::ImageRepPNG* png_rep =
             GetRepresentation(kImageRepPNG, true)->AsImageRepPNG();
         scoped_rep.reset(new internal::ImageRepCocoaTouch(
             internal::CreateUIImageFromPNG(png_rep->image_reps())));
         break;
       }
       case kImageRepSkia: {
         internal::ImageRepSkia* skia_rep =
             GetRepresentation(kImageRepSkia, true)->AsImageRepSkia();
         UIImage* image = UIImageFromImageSkia(*skia_rep->image());
         base::mac::NSObjectRetain(image);
         scoped_rep.reset(new internal::ImageRepCocoaTouch(image));
         break;
       }
       default:
         NOTREACHED();
     }
     CHECK(scoped_rep);
-    rep = scoped_rep.get();
-    AddRepresentation(std::move(scoped_rep));
+    rep = AddRepresentation(std::move(scoped_rep));
   }
   return rep->AsImageRepCocoaTouch()->image();
 }
 #elif defined(OS_MACOSX)
 NSImage* Image::ToNSImage() const {
   internal::ImageRep* rep = GetRepresentation(kImageRepCocoa, false);
   if (!rep) {
     scoped_ptr<internal::ImageRep> scoped_rep;
     CGColorSpaceRef default_representation_color_space =
         storage_->default_representation_color_space();
@@ skipping 12 matching lines @@
         NSImage* image = NSImageFromImageSkiaWithColorSpace(*skia_rep->image(),
             default_representation_color_space);
         base::mac::NSObjectRetain(image);
         scoped_rep.reset(new internal::ImageRepCocoa(image));
         break;
       }
       default:
         NOTREACHED();
     }
     CHECK(scoped_rep);
-    rep = scoped_rep.get();
-    AddRepresentation(std::move(scoped_rep));
+    rep = AddRepresentation(std::move(scoped_rep));
   }
   return rep->AsImageRepCocoa()->image();
 }
 #endif
 
 scoped_refptr<base::RefCountedMemory> Image::As1xPNGBytes() const {
   if (IsEmpty())
     return new base::RefCountedBytes();
 
   internal::ImageRep* rep = GetRepresentation(kImageRepPNG, false);
@@ skipping 152 matching lines @@
   CHECK(storage_.get());
   RepresentationMap::const_iterator it =
       storage_->representations().find(rep_type);
   if (it == storage_->representations().end()) {
     CHECK(!must_exist);
     return NULL;
   }
   return it->second.get();
 }
 
-void Image::AddRepresentation(scoped_ptr<internal::ImageRep> rep) const {
+internal::ImageRep* Image::AddRepresentation(
+    scoped_ptr<internal::ImageRep> rep) const {
   CHECK(storage_.get());
   RepresentationType type = rep->type();
   auto result =
       storage_->representations().insert(std::make_pair(type, std::move(rep)));
 
   // insert should not fail (implies that there was already a representation of
   // that type in the map).
   CHECK(result.second) << "type was already in map.";
+
+  return result.first->second.get();
 }
 
 }  // namespace gfx