Index: chrome/browser/extensions/extension_service_unittest.cc |
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc |
index e947a5fee7caade1dae950101829503589acab40..534a507981eabfb957d7a97cedbf37a35ea7299d 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -458,8 +458,8 @@ void ExtensionServiceTestBase::InitializeExtensionService( |
params.pref_file, loop_.message_loop_proxy()); |
scoped_refptr<user_prefs::PrefRegistrySyncable> registry( |
new user_prefs::PrefRegistrySyncable); |
- scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry)); |
- chrome::RegisterUserPrefs(registry); |
+ scoped_ptr<PrefServiceSyncable> prefs(builder.CreateSyncable(registry.get())); |
+ chrome::RegisterUserPrefs(registry.get()); |
profile_builder.SetPrefService(prefs.Pass()); |
profile_builder.SetPath(params.profile_path); |
profile_ = profile_builder.Build(); |
@@ -803,9 +803,9 @@ class ExtensionServiceTest |
EXPECT_EQ(1u, loaded_.size()) << path.value(); |
EXPECT_EQ(expected_extensions_count_, service_->extensions()->size()) << |
path.value(); |
- extension = loaded_[0]; |
- EXPECT_TRUE(service_->GetExtensionById(extension->id(), false)) << |
- path.value(); |
+ extension = loaded_[0].get(); |
+ EXPECT_TRUE(service_->GetExtensionById(extension->id(), false)) |
+ << path.value(); |
} |
for (std::vector<string16>::iterator err = errors.begin(); |
@@ -1215,7 +1215,7 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) { |
AddPattern(&expected_patterns, "file:///*"); |
AddPattern(&expected_patterns, "http://*.google.com/*"); |
AddPattern(&expected_patterns, "https://*.google.com/*"); |
- const Extension* extension = loaded_[0]; |
+ const Extension* extension = loaded_[0].get(); |
const extensions::UserScriptList& scripts = |
extensions::ContentScriptsInfo::GetContentScripts(extension); |
ASSERT_EQ(2u, scripts.size()); |
@@ -1255,17 +1255,18 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) { |
EXPECT_EQ(std::string("My extension 2"), loaded_[1]->name()); |
EXPECT_EQ(std::string(), loaded_[1]->description()); |
EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"), |
- extensions::BackgroundInfo::GetBackgroundURL(loaded_[1])); |
- EXPECT_EQ( |
- 0u, extensions::ContentScriptsInfo::GetContentScripts(loaded_[1]).size()); |
+ extensions::BackgroundInfo::GetBackgroundURL(loaded_[1].get())); |
+ EXPECT_EQ(0u, |
+ extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get()) |
+ .size()); |
// We don't parse the plugins section on Chrome OS. |
#if defined(OS_CHROMEOS) |
EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(loaded_[1])); |
#else |
- ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1])); |
+ ASSERT_TRUE(extensions::PluginInfo::HasPlugins(loaded_[1].get())); |
const std::vector<extensions::PluginInfo>* plugins = |
- extensions::PluginInfo::GetPlugins(loaded_[1]); |
+ extensions::PluginInfo::GetPlugins(loaded_[1].get()); |
ASSERT_TRUE(plugins); |
ASSERT_EQ(2u, plugins->size()); |
EXPECT_EQ(loaded_[1]->path().AppendASCII("content_plugin.dll").value(), |
@@ -1282,9 +1283,9 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) { |
EXPECT_EQ(std::string(good2), loaded_[index]->id()); |
EXPECT_EQ(std::string("My extension 3"), loaded_[index]->name()); |
EXPECT_EQ(std::string(), loaded_[index]->description()); |
- EXPECT_EQ( |
- 0u, |
- extensions::ContentScriptsInfo::GetContentScripts(loaded_[index]).size()); |
+ EXPECT_EQ(0u, |
+ extensions::ContentScriptsInfo::GetContentScripts( |
+ loaded_[index].get()).size()); |
EXPECT_EQ(Manifest::INTERNAL, loaded_[index]->location()); |
}; |
@@ -4207,7 +4208,8 @@ void ExtensionServiceTest::TestExternalProvider( |
// Uninstall the extension and reload. Nothing should happen because the |
// preference should prevent us from reinstalling. |
std::string id = loaded_[0]->id(); |
- bool no_uninstall = management_policy_->MustRemainEnabled(loaded_[0], NULL); |
+ bool no_uninstall = |
+ management_policy_->MustRemainEnabled(loaded_[0].get(), NULL); |
service_->UninstallExtension(id, false, NULL); |
loop_.RunUntilIdle(); |
@@ -4239,7 +4241,7 @@ void ExtensionServiceTest::TestExternalProvider( |
ValidateIntegerPref(good_crx, "state", Extension::ENABLED); |
ValidateIntegerPref(good_crx, "location", location); |
- if (management_policy_->MustRemainEnabled(loaded_[0], NULL)) { |
+ if (management_policy_->MustRemainEnabled(loaded_[0].get(), NULL)) { |
EXPECT_EQ(2, provider->visit_count()); |
} else { |
// Now test an externally triggered uninstall (deleting the registry key or |