Convert //extensions/browser from scoped_ptr to std::unique_ptr

extensions/browser/extension_icon_image_unittest.cc

Index: extensions/browser/extension_icon_image_unittest.cc
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc
index dba5e05dbd06bb0325a61399460fa7ec2ecbf14c..71a3964fd64c242e63b3fc869b6c8d43c534967f 100644
--- a/extensions/browser/extension_icon_image_unittest.cc
+++ b/extensions/browser/extension_icon_image_unittest.cc
@@ -105,8 +105,9 @@ class ExtensionIconImageTest : public ExtensionsTest,
     std::string error;
     JSONFileValueDeserializer deserializer(
         test_file.AppendASCII("manifest.json"));
-    scoped_ptr<base::DictionaryValue> valid_value = base::DictionaryValue::From(
-        deserializer.Deserialize(&error_code, &error));
+    std::unique_ptr<base::DictionaryValue> valid_value =
+        base::DictionaryValue::From(
+            deserializer.Deserialize(&error_code, &error));
     EXPECT_EQ(0, error_code) << error;
     if (error_code != 0)
       return NULL;
@@ -143,7 +144,7 @@ class ExtensionIconImageTest : public ExtensionsTest,
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   content::TestBrowserThread io_thread_;
-  scoped_ptr<content::NotificationService> notification_service_;
+  std::unique_ptr<content::NotificationService> notification_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionIconImageTest);
 };
@@ -472,13 +473,9 @@ TEST_F(ExtensionIconImageTest, IconImageDestruction) {
       TestImageLoader::LoadAndGetExtensionBitmap(extension.get(), "16.png", 16);
   ASSERT_FALSE(bitmap_16.empty());
 
-  scoped_ptr<IconImage> image(
-      new IconImage(browser_context(),
-                    extension.get(),
-                    IconsInfo::GetIcons(extension.get()),
-                    16,
-                    default_icon,
-                    this));
+  std::unique_ptr<IconImage> image(new IconImage(
+      browser_context(), extension.get(), IconsInfo::GetIcons(extension.get()),
+      16, default_icon, this));
 
   // Load an image representation.
   gfx::ImageSkiaRep representation =
@@ -518,13 +515,9 @@ TEST_F(ExtensionIconImageTest, ImageCachesNewRepresentations) {
       CreateExtension("extension_icon_image", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   gfx::ImageSkia default_icon = GetDefaultIcon();
-  scoped_ptr<IconImage> icon_image(
-      new IconImage(browser_context(),
-                    extension.get(),
-                    IconsInfo::GetIcons(extension.get()),
-                    16,
-                    default_icon,
-                    this));
+  std::unique_ptr<IconImage> icon_image(new IconImage(
+      browser_context(), extension.get(), IconsInfo::GetIcons(extension.get()),
+      16, default_icon, this));
 
   // Load an image representation.
   gfx::ImageSkiaRep representation =