Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 15 insertions, 12 deletions

diff --git a/chrome/browser/sync/glue/theme_util_unittest.cc b/chrome/browser/sync/glue/theme_util_unittest.cc
index fb6641f..3eac301 100644
--- a/chrome/browser/sync/glue/theme_util_unittest.cc
+++ b/chrome/browser/sync/glue/theme_util_unittest.cc
@@ -23,17 +23,20 @@ using ::testing::Return;
 class ThemeUtilTest : public testing::Test {
 };
 
-void MakeThemeExtension(Extension* extension,
-                        const std::string& name,
-                        const std::string& update_url) {
+scoped_refptr<Extension> MakeThemeExtension(const FilePath& extension_path,
+                                            const std::string& name,
+                                            const std::string& update_url) {
   DictionaryValue source;
   source.SetString(extension_manifest_keys::kName, name);
   source.Set(extension_manifest_keys::kTheme, new DictionaryValue());
   source.SetString(extension_manifest_keys::kUpdateURL, update_url);
   source.SetString(extension_manifest_keys::kVersion, "0.0.0.0");
   std::string error;
-  EXPECT_TRUE(extension->InitFromValue(source, false, &error));
+  scoped_refptr<Extension> extension = Extension::Create(
+      extension_path, Extension::INTERNAL, source, false, &error);
+  EXPECT_TRUE(extension);
   EXPECT_EQ("", error);
+  return extension;
 }
 
 TEST_F(ThemeUtilTest, AreThemeSpecificsEqualHelper) {
@@ -168,17 +171,17 @@ TEST_F(ThemeUtilTest, GetThemeSpecificsHelperCustomTheme) {
   theme_specifics.set_use_custom_theme(false);
   theme_specifics.set_use_system_theme_by_default(true);
   FilePath file_path(kExtensionFilePath);
-  Extension extension(file_path);
   const std::string kThemeName("name");
   const std::string kThemeUpdateUrl("http://update.url/foo");
-  MakeThemeExtension(&extension, kThemeName, kThemeUpdateUrl);
-  GetThemeSpecificsFromCurrentThemeHelper(&extension, false, false,
+  scoped_refptr<Extension> extension(
+      MakeThemeExtension(file_path, kThemeName, kThemeUpdateUrl));
+  GetThemeSpecificsFromCurrentThemeHelper(extension.get(), false, false,
                                           &theme_specifics);
 
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_TRUE(theme_specifics.use_system_theme_by_default());
   EXPECT_EQ(kThemeName, theme_specifics.custom_theme_name());
-  EXPECT_EQ(extension.id(), theme_specifics.custom_theme_id());
+  EXPECT_EQ(extension->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(kThemeUpdateUrl, theme_specifics.custom_theme_update_url());
 }
 
@@ -186,18 +189,18 @@ TEST_F(ThemeUtilTest, GetThemeSpecificsHelperCustomThemeDistinct) {
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_custom_theme(false);
   FilePath file_path(kExtensionFilePath);
-  Extension extension(file_path);
   const std::string kThemeName("name");
   const std::string kThemeUpdateUrl("http://update.url/foo");
-  MakeThemeExtension(&extension, kThemeName, kThemeUpdateUrl);
-  GetThemeSpecificsFromCurrentThemeHelper(&extension, true, false,
+  scoped_refptr<Extension> extension(
+      MakeThemeExtension(file_path, kThemeName, kThemeUpdateUrl));
+  GetThemeSpecificsFromCurrentThemeHelper(extension.get(), true, false,
                                           &theme_specifics);
 
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_TRUE(theme_specifics.has_use_system_theme_by_default());
   EXPECT_FALSE(theme_specifics.use_system_theme_by_default());
   EXPECT_EQ(kThemeName, theme_specifics.custom_theme_name());
-  EXPECT_EQ(extension.id(), theme_specifics.custom_theme_id());
+  EXPECT_EQ(extension->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(kThemeUpdateUrl, theme_specifics.custom_theme_update_url());
 }