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 1a68f05c284251f314c103c5fb2cc12e0a5123cb..a5f072d461e3096c1633a30e290abc45b29aff6f 100644 |
--- a/chrome/browser/extensions/extension_service_unittest.cc |
+++ b/chrome/browser/extensions/extension_service_unittest.cc |
@@ -701,7 +701,7 @@ class ExtensionServiceTest |
EXPECT_EQ(0u, errors.size()) << path.value(); |
EXPECT_EQ(expected_extensions_count_, service_->extensions()->size()) << |
path.value(); |
- extension = loaded_[0]; |
+ extension = loaded_[0].get(); |
EXPECT_TRUE(service_->GetExtensionById(extension->id(), false)) << |
path.value(); |
for (std::vector<string16>::iterator err = errors.begin(); |
@@ -1103,7 +1103,7 @@ TEST_F(ExtensionServiceTest, DISABLED_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 = extension->content_scripts(); |
ASSERT_EQ(2u, scripts.size()); |
EXPECT_EQ(expected_patterns, scripts[0].url_patterns()); |
@@ -1684,7 +1684,7 @@ TEST_F(ExtensionServiceTest, DISABLED_GrantedAPIAndHostPermissions) { |
extension = *service_->disabled_extensions()->begin(); |
ASSERT_TRUE(prefs->IsExtensionDisabled(extension_id)); |
- ASSERT_FALSE(service_->IsExtensionEnabled(extension_id)); |
+ ASSERT_FALSE*service_->disabled_extensions()->begin().get()d)); |
ASSERT_TRUE(prefs->DidExtensionEscalatePermissions(extension_id)); |
// Now grant and re-enable the extension, making sure the prefs are updated. |
@@ -1727,7 +1727,7 @@ TEST_F(ExtensionServiceTest, DISABLED_GrantedAPIAndHostPermissions) { |
extension = *service_->disabled_extensions()->begin(); |
ASSERT_TRUE(prefs->IsExtensionDisabled(extension_id)); |
- ASSERT_FALSE(service_->IsExtensionEnabled(extension_id)); |
+ ASSERT_FALSE*service_->disabled_extensions()->begin().get()d)); |
ASSERT_TRUE(prefs->DidExtensionEscalatePermissions(extension_id)); |
// Now grant and re-enable the extension, making sure the prefs are updated. |
@@ -1995,11 +1995,11 @@ TEST_F(ExtensionServiceTest, DISABLED_LoadLocalizedTheme) { |
const Extension* theme = *service_->extensions()->begin(); |
EXPECT_EQ("name", theme->name()); |
EXPECT_EQ("description", theme->description()); |
-} |
+}*service_->extensions()->begin().get() |
-// Tests that we can change the ID of an unpacked extension by adding a key |
-// to its manifest. |
-TEST_F(ExtensionServiceTest, DISABLED_UnpackedExtensionCanChangeID) { |
+ // Tests that we can change the ID of an unpacked extension by adding a key |
+ // to its manifest. |
+ TEST_F(ExtensionServiceTest, DISABLED_UnpackedExtensionCanChangeID) { |
InitializeEmptyExtensionService(); |
ScopedTempDir temp; |
@@ -3243,8 +3243,8 @@ TEST_F(ExtensionServiceTest, DISABLED_ManagementPolicyProhibitsLoadFromPrefs) { |
// Ensure we cannot load it if management policy prohibits installation. |
extensions::TestManagementPolicyProvider provider_( |
- extensions::TestManagementPolicyProvider::PROHIBIT_LOAD); |
- management_policy_->RegisterProvider(&provider_); |
+ extensions::TestManagemen*(service_->extensions()->begin()).get() |
+ management_policy_->RegisterProvider(&provider_); |
extensions::InstalledLoader(service_).Load(extension_info, false); |
EXPECT_EQ(0u, service_->extensions()->size()); |