diff options
| author | dcheng <dcheng@chromium.org> | 2014-08-25 22:05:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-26 05:06:55 +0000 |
| commit | c704794140dcfe95c002c7b0bfd7361f33088190 (patch) | |
| tree | c78e5d70e95737ee4c5b5599717335903999b0ae | |
| parent | 1bba58e7ed1fdfb97d53f7ed26df5571c2e9d7c5 (diff) | |
| download | chromium_src-c704794140dcfe95c002c7b0bfd7361f33088190.zip chromium_src-c704794140dcfe95c002c7b0bfd7361f33088190.tar.gz chromium_src-c704794140dcfe95c002c7b0bfd7361f33088190.tar.bz2 | |
Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/
This patch was generated by running the rewrite_scoped_refptr clang tool
on a Linux build.
BUG=110610
Review URL: https://codereview.chromium.org/508513002
Cr-Commit-Position: refs/heads/master@{#291844}
37 files changed, 244 insertions, 214 deletions
diff --git a/chrome/browser/extensions/active_script_controller_unittest.cc b/chrome/browser/extensions/active_script_controller_unittest.cc index f816f6d..010ad02 100644 --- a/chrome/browser/extensions/active_script_controller_unittest.cc +++ b/chrome/browser/extensions/active_script_controller_unittest.cc @@ -110,8 +110,8 @@ const Extension* ActiveScriptControllerUnitTest::AddExtension() { .Build(); ExtensionRegistry::Get(profile())->AddEnabled(extension_); - PermissionsUpdater(profile()).InitializePermissions(extension_); - return extension_; + PermissionsUpdater(profile()).InitializePermissions(extension_.get()); + return extension_.get(); } const Extension* ActiveScriptControllerUnitTest::ReloadExtension() { diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index b360fbd..efa00dc 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -108,8 +108,8 @@ class ActiveTabTest : public ChromeRenderViewHostTestHarness { PermittedFeature feature, int tab_id) { const PermissionsData* permissions_data = extension->permissions_data(); - bool script = - permissions_data->CanAccessPage(extension, url, url, tab_id, -1, NULL); + bool script = permissions_data->CanAccessPage( + extension.get(), url, url, tab_id, -1, NULL); bool capture = HasTabsPermission(extension, tab_id) && permissions_data->CanCaptureVisiblePage(tab_id, NULL); switch (feature) { diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc index 56079f0..4d90dee 100644 --- a/chrome/browser/extensions/blacklist.cc +++ b/chrome/browser/extensions/blacklist.cc @@ -160,7 +160,7 @@ Blacklist::ScopedDatabaseManagerForTest::~ScopedDatabaseManagerForTest() { Blacklist::Blacklist(ExtensionPrefs* prefs) { scoped_refptr<SafeBrowsingDatabaseManager> database_manager = g_database_manager.Get().get(); - if (database_manager) { + if (database_manager.get()) { registrar_.Add( this, chrome::NOTIFICATION_SAFE_BROWSING_UPDATE_COMPLETE, diff --git a/chrome/browser/extensions/blacklist_state_fetcher.cc b/chrome/browser/extensions/blacklist_state_fetcher.cc index c28afa0..bbb6523 100644 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc @@ -40,7 +40,7 @@ class BlacklistRequestContextGetter : public net::URLRequestContextGetter { DCHECK_CURRENTLY_ON(BrowserThread::IO); scoped_refptr<net::URLRequestContextGetter> context_getter = - new BlacklistRequestContextGetter(parent_context_getter); + new BlacklistRequestContextGetter(parent_context_getter.get()); BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(callback, context_getter)); @@ -99,8 +99,8 @@ void BlacklistStateFetcher::Request(const std::string& id, if (request_already_sent) return; - if (url_request_context_getter_ || - !g_browser_process || !g_browser_process->safe_browsing_service()) { + if (url_request_context_getter_.get() || !g_browser_process || + !g_browser_process->safe_browsing_service()) { SendRequest(id); } else { scoped_refptr<net::URLRequestContextGetter> parent_request_context; @@ -125,7 +125,7 @@ void BlacklistStateFetcher::SaveRequestContext( const std::string& id, scoped_refptr<net::URLRequestContextGetter> request_context_getter) { DCHECK_CURRENTLY_ON(BrowserThread::UI); - if (!url_request_context_getter_) + if (!url_request_context_getter_.get()) url_request_context_getter_ = request_context_getter; SendRequest(id); } @@ -145,7 +145,7 @@ void BlacklistStateFetcher::SendRequest(const std::string& id) { this); requests_[fetcher] = id; fetcher->SetAutomaticallyRetryOn5xx(false); // Don't retry on error. - fetcher->SetRequestContext(url_request_context_getter_); + fetcher->SetRequestContext(url_request_context_getter_.get()); fetcher->SetUploadData("application/octet-stream", request_str); fetcher->Start(); } diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc index aba1f6f..422194c 100644 --- a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc +++ b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc @@ -75,14 +75,14 @@ TEST_F(BrowserPermissionsPolicyDelegateTest, CanExecuteScriptOnPage) { // The same call should succeed with a normal process, but fail with a signin // process. const PermissionsData* permissions_data = extension->permissions_data(); - EXPECT_TRUE(permissions_data->CanAccessPage(extension, + EXPECT_TRUE(permissions_data->CanAccessPage(extension.get(), kSigninUrl, kSigninUrl, -1, // no tab id. normal_process.GetID(), &error)) << error; - EXPECT_FALSE(permissions_data->CanAccessPage(extension, + EXPECT_FALSE(permissions_data->CanAccessPage(extension.get(), kSigninUrl, kSigninUrl, -1, // no tab id. diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 5dd139e..77a1a47 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -307,7 +307,7 @@ CrxInstallerError CrxInstaller::AllowInstall(const Extension* extension) { scoped_refptr<const PermissionSet> expected_permissions = dummy_extension->permissions_data()->active_permissions(); valid = !(PermissionMessageProvider::Get()->IsPrivilegeIncrease( - expected_permissions, + expected_permissions.get(), extension->permissions_data()->active_permissions(), extension->GetType())); } diff --git a/chrome/browser/extensions/error_console/error_console_unittest.cc b/chrome/browser/extensions/error_console/error_console_unittest.cc index d330cbf..b6f18ab 100644 --- a/chrome/browser/extensions/error_console/error_console_unittest.cc +++ b/chrome/browser/extensions/error_console/error_console_unittest.cc @@ -111,14 +111,14 @@ TEST_F(ErrorConsoleUnitTest, EnableAndDisableErrorConsole) { .Build(); ExtensionRegistry* registry = ExtensionRegistry::Get(profile_.get()); registry->AddEnabled(adt); - registry->TriggerOnLoaded(adt); + registry->TriggerOnLoaded(adt.get()); EXPECT_TRUE(error_console_->enabled()); EXPECT_FALSE(error_console_->IsEnabledForChromeExtensionsPage()); EXPECT_TRUE(error_console_->IsEnabledForAppsDeveloperTools()); // Unloading the Apps Developer Tools should disable error console. registry->RemoveEnabled(adt->id()); - registry->TriggerOnUnloaded(adt, UnloadedExtensionInfo::REASON_DISABLE); + registry->TriggerOnUnloaded(adt.get(), UnloadedExtensionInfo::REASON_DISABLE); EXPECT_FALSE(error_console_->enabled()); EXPECT_FALSE(error_console_->IsEnabledForChromeExtensionsPage()); EXPECT_FALSE(error_console_->IsEnabledForAppsDeveloperTools()); diff --git a/chrome/browser/extensions/extension_action_manager_unittest.cc b/chrome/browser/extensions/extension_action_manager_unittest.cc index d77ca8d..2240125 100644 --- a/chrome/browser/extensions/extension_action_manager_unittest.cc +++ b/chrome/browser/extensions/extension_action_manager_unittest.cc @@ -121,11 +121,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues( action_type); ASSERT_TRUE(extension.get()); - const ExtensionAction* action = GetAction(action_type, *extension); + const ExtensionAction* action = GetAction(action_type, *extension.get()); ASSERT_TRUE(action); - ASSERT_TRUE(TitlesMatch(*extension, *action)); - ASSERT_TRUE(IconsMatch(*extension, 128, *action, 38)); + ASSERT_TRUE(TitlesMatch(*extension.get(), *action)); + ASSERT_TRUE(IconsMatch(*extension.get(), 128, *action, 38)); // Test that the action's missing default_icons are not replaced with smaller // icons. @@ -135,11 +135,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues( action_type); ASSERT_TRUE(extension.get()); - action = GetAction(action_type, *extension); + action = GetAction(action_type, *extension.get()); ASSERT_TRUE(action); - ASSERT_TRUE(IconsMatch(*extension, 24, *action, 19)); - ASSERT_FALSE(IconsMatch(*extension, 24, *action, 38)); + ASSERT_TRUE(IconsMatch(*extension.get(), 24, *action, 19)); + ASSERT_FALSE(IconsMatch(*extension.get(), 24, *action, 38)); // Test that an action's 19px icon is not replaced if a 38px action icon // exists. @@ -150,10 +150,10 @@ void ExtensionActionManagerTest::TestPopulateMissingValues( action_type); ASSERT_TRUE(extension.get()); - action = GetAction(action_type, *extension); + action = GetAction(action_type, *extension.get()); ASSERT_TRUE(action); - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19)); + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19)); // Test that existing default_icons and default_title are not replaced. extension = BuildExtension( @@ -165,12 +165,12 @@ void ExtensionActionManagerTest::TestPopulateMissingValues( action_type); ASSERT_TRUE(extension.get()); - action = GetAction(action_type, *extension); + action = GetAction(action_type, *extension.get()); ASSERT_TRUE(action); - ASSERT_FALSE(TitlesMatch(*extension, *action)); - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 19)); - ASSERT_FALSE(IconsMatch(*extension, 128, *action, 38)); + ASSERT_FALSE(TitlesMatch(*extension.get(), *action)); + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19)); + ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 38)); } namespace { @@ -195,7 +195,7 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) { // Get a "best fit" browser action for |extension|. scoped_ptr<ExtensionAction> action = - manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER); + manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER); ASSERT_TRUE(action.get()); ASSERT_EQ(action->action_type(), ActionInfo::TYPE_BROWSER); @@ -211,12 +211,13 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) { kPageAction); ASSERT_TRUE(extension.get()); - action = manager()->GetBestFitAction(*extension, ActionInfo::TYPE_BROWSER); + action = + manager()->GetBestFitAction(*extension.get(), ActionInfo::TYPE_BROWSER); // Now these values match because |extension| does not have page action // defaults. - ASSERT_TRUE(TitlesMatch(*extension, *action)); - ASSERT_TRUE(IconsMatch(*extension, 48, *action, 38)); + ASSERT_TRUE(TitlesMatch(*extension.get(), *action)); + ASSERT_TRUE(IconsMatch(*extension.get(), 48, *action, 38)); } } // namespace diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc index 51d645c..47d02db 100644 --- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc +++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc @@ -172,41 +172,41 @@ TEST_F(ExtensionContextMenuModelTest, ExtensionItemTest) { new ExtensionContextMenuModel(extension.get(), browser.get())); // There should be no extension items yet. - EXPECT_EQ(0, CountExtensionItems(menu)); + EXPECT_EQ(0, CountExtensionItems(menu.get())); // Add a browser action menu item for |extension| to |manager|. AddContextItemAndRefreshModel( - manager, extension.get(), MenuItem::BROWSER_ACTION, menu); + manager, extension.get(), MenuItem::BROWSER_ACTION, menu.get()); // Since |extension| has a page action, the browser action menu item should // not be present. - EXPECT_EQ(0, CountExtensionItems(menu)); + EXPECT_EQ(0, CountExtensionItems(menu.get())); // Add a page action menu item and reset the context menu. AddContextItemAndRefreshModel( - manager, extension.get(), MenuItem::PAGE_ACTION, menu); + manager, extension.get(), MenuItem::PAGE_ACTION, menu.get()); // The page action item should be present because |extension| has a page // action. - EXPECT_EQ(1, CountExtensionItems(menu)); + EXPECT_EQ(1, CountExtensionItems(menu.get())); // Create more page action items to test top level menu item limitations. for (int i = 0; i < api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT; ++i) AddContextItemAndRefreshModel( - manager, extension.get(), MenuItem::PAGE_ACTION, menu); + manager, extension.get(), MenuItem::PAGE_ACTION, menu.get()); // The menu should only have a limited number of extension items, since they // are all top level items, and we limit the number of top level extension // items. EXPECT_EQ(api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT, - CountExtensionItems(menu)); + CountExtensionItems(menu.get())); AddContextItemAndRefreshModel( - manager, extension.get(), MenuItem::PAGE_ACTION, menu); + manager, extension.get(), MenuItem::PAGE_ACTION, menu.get()); // Adding another top level item should not increase the count. EXPECT_EQ(api::context_menus::ACTION_MENU_TOP_LEVEL_LIMIT, - CountExtensionItems(menu)); + CountExtensionItems(menu.get())); } // Test that the "show" and "hide" menu items appear correctly in the extension diff --git a/chrome/browser/extensions/extension_error_controller.cc b/chrome/browser/extensions/extension_error_controller.cc index 8ae3154..cf2f07c 100644 --- a/chrome/browser/extensions/extension_error_controller.cc +++ b/chrome/browser/extensions/extension_error_controller.cc @@ -119,7 +119,7 @@ void ExtensionErrorController::IdentifyAlertableExtensions() { for (ExtensionSet::const_iterator iter = enabled_set.begin(); iter != enabled_set.end(); ++iter) { - const Extension* extension = *iter; + const Extension* extension = iter->get(); // Skip for extensions that have pending updates. They will be checked again // once the pending update is finished. diff --git a/chrome/browser/extensions/extension_error_controller_unittest.cc b/chrome/browser/extensions/extension_error_controller_unittest.cc index ef8e6b1..2868a67 100644 --- a/chrome/browser/extensions/extension_error_controller_unittest.cc +++ b/chrome/browser/extensions/extension_error_controller_unittest.cc @@ -152,7 +152,7 @@ ExtensionPrefs* ExtensionErrorControllerUnitTest::GetPrefs() { TEST_F(ExtensionErrorControllerUnitTest, ClosingAcknowledgesBlacklisted) { // Add a blacklisted extension. scoped_refptr<const Extension> extension = BuildExtension(); - ASSERT_TRUE(AddBlacklistedExtension(extension)); + ASSERT_TRUE(AddBlacklistedExtension(extension.get())); service_->Init(); @@ -181,7 +181,7 @@ TEST_F(ExtensionErrorControllerUnitTest, ClosingAcknowledgesBlacklisted) { TEST_F(ExtensionErrorControllerUnitTest, AcceptingAcknowledgesBlacklisted) { // Add a blacklisted extension. scoped_refptr<const Extension> extension = BuildExtension(); - ASSERT_TRUE(AddBlacklistedExtension(extension)); + ASSERT_TRUE(AddBlacklistedExtension(extension.get())); service_->Init(); @@ -200,7 +200,7 @@ TEST_F(ExtensionErrorControllerUnitTest, AcceptingAcknowledgesBlacklisted) { // already been acknowledged. TEST_F(ExtensionErrorControllerUnitTest, DontWarnForAcknowledgedBlacklisted) { scoped_refptr<const Extension> extension = BuildExtension(); - ASSERT_TRUE(AddBlacklistedExtension(extension)); + ASSERT_TRUE(AddBlacklistedExtension(extension.get())); GetPrefs()->AcknowledgeBlacklistedExtension(extension->id()); diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc index 21027f3..5aef203 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc +++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc @@ -411,29 +411,29 @@ TEST_F(ExtensionGCMAppHandlerTest, AddAndRemoveAppHandler) { scoped_refptr<Extension> extension(CreateExtension()); // App handler is added when extension is loaded. - LoadExtension(extension); + LoadExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_TRUE(HasAppHandlers(extension->id())); // App handler is removed when extension is unloaded. - DisableExtension(extension); + DisableExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_FALSE(HasAppHandlers(extension->id())); // App handler is added when extension is reloaded. - EnableExtension(extension); + EnableExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_TRUE(HasAppHandlers(extension->id())); // App handler is removed when extension is uninstalled. - UninstallExtension(extension); + UninstallExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_FALSE(HasAppHandlers(extension->id())); } TEST_F(ExtensionGCMAppHandlerTest, UnregisterOnExtensionUninstall) { scoped_refptr<Extension> extension(CreateExtension()); - LoadExtension(extension); + LoadExtension(extension.get()); // Sign-in is needed for registration. SignIn(kTestingUsername); @@ -451,7 +451,7 @@ TEST_F(ExtensionGCMAppHandlerTest, UnregisterOnExtensionUninstall) { GetGCMDriver()->AddAppHandler("Foo", gcm_app_handler()); // Unregistration should be triggered when the extension is uninstalled. - UninstallExtension(extension); + UninstallExtension(extension.get()); waiter()->WaitUntilCompleted(); EXPECT_EQ(gcm::GCMClient::SUCCESS, gcm_app_handler()->unregistration_result()); @@ -464,12 +464,12 @@ TEST_F(ExtensionGCMAppHandlerTest, UpdateExtensionWithGcmPermissionKept) { scoped_refptr<Extension> extension(CreateExtension()); // App handler is added when the extension is loaded. - LoadExtension(extension); + LoadExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_TRUE(HasAppHandlers(extension->id())); // App handler count should not drop to zero when the extension is updated. - UpdateExtension(extension, "gcm2.crx"); + UpdateExtension(extension.get(), "gcm2.crx"); waiter()->PumpUILoop(); EXPECT_FALSE(gcm_app_handler()->app_handler_count_drop_to_zero()); EXPECT_TRUE(HasAppHandlers(extension->id())); @@ -479,13 +479,13 @@ TEST_F(ExtensionGCMAppHandlerTest, UpdateExtensionWithGcmPermissionRemoved) { scoped_refptr<Extension> extension(CreateExtension()); // App handler is added when the extension is loaded. - LoadExtension(extension); + LoadExtension(extension.get()); waiter()->PumpUILoop(); EXPECT_TRUE(HasAppHandlers(extension->id())); // App handler is removed when the extension is updated to the version that // has GCM permission removed. - UpdateExtension(extension, "good2.crx"); + UpdateExtension(extension.get(), "good2.crx"); waiter()->PumpUILoop(); EXPECT_TRUE(gcm_app_handler()->app_handler_count_drop_to_zero()); EXPECT_FALSE(HasAppHandlers(extension->id())); diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 82745c9..dec1aa5 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -311,8 +311,8 @@ int ExtensionInstallPrompt::Prompt::GetDialogButtons() const { } bool ExtensionInstallPrompt::Prompt::ShouldShowExplanationText() const { - return type_ == INSTALL_PROMPT && - extension_->is_extension() && experiment_ && experiment_->text_only(); + return type_ == INSTALL_PROMPT && extension_->is_extension() && + experiment_.get() && experiment_->text_only(); } bool ExtensionInstallPrompt::Prompt::HasAcceptButtonLabel() const { @@ -748,9 +748,9 @@ void ExtensionInstallPrompt::ShowConfirmation() { const extensions::PermissionMessageProvider* message_provider = extensions::PermissionMessageProvider::Get(); prompt_->SetPermissions( - message_provider->GetWarningMessages(permissions_, type)); + message_provider->GetWarningMessages(permissions_.get(), type)); prompt_->SetPermissionsDetails( - message_provider->GetWarningMessagesDetails(permissions_, type)); + message_provider->GetWarningMessagesDetails(permissions_.get(), type)); } switch (prompt_->type()) { diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h index bc185eb..54fa47e 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h @@ -167,7 +167,7 @@ class ExtensionInstallPrompt bool has_webstore_data() const { return has_webstore_data_; } const ExtensionInstallPromptExperiment* experiment() const { - return experiment_; + return experiment_.get(); } void set_experiment(ExtensionInstallPromptExperiment* experiment) { experiment_ = experiment; diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc index 347db0f..d43e46b 100644 --- a/chrome/browser/extensions/extension_install_prompt_unittest.cc +++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc @@ -49,8 +49,8 @@ TEST(ExtensionInstallPromptUnittest, PromptShowsPermissionWarnings) { prompt.set_callback_for_test(base::Bind(&VerifyPromptPermissionsCallback, run_loop.QuitClosure())); prompt.ConfirmPermissions(NULL, // no delegate - extension, - permission_set); + extension.get(), + permission_set.get()); run_loop.Run(); } diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index 1d6fff6..456d85c 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -461,12 +461,12 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, NotInstalled) { ui_test_utils::NavigateToURL(browser(), chromium_org_url()); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToMainFrame(extension)); + CanConnectAndSendMessagesToMainFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); ui_test_utils::NavigateToURL(browser(), google_com_url()); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToMainFrame(extension)); + CanConnectAndSendMessagesToMainFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); } @@ -477,30 +477,33 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, // Install the web connectable extension. chromium.org can connect to it, // google.com can't. - const Extension* chromium_connectable = LoadChromiumConnectableExtension(); + scoped_refptr<const Extension> chromium_connectable = + LoadChromiumConnectableExtension(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + EXPECT_EQ(OK, + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); ui_test_utils::NavigateToURL(browser(), google_com_url()); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); // Install the non-connectable extension. Nothing can connect to it. - const Extension* not_connectable = LoadNotConnectableExtension(); + scoped_refptr<const Extension> not_connectable = + LoadNotConnectableExtension(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // Namespace will be defined here because |chromium_connectable| can connect // to it - so this will be the "cannot establish connection" error. EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToMainFrame(not_connectable)); + CanConnectAndSendMessagesToMainFrame(not_connectable.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); ui_test_utils::NavigateToURL(browser(), google_com_url()); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToMainFrame(not_connectable)); + CanConnectAndSendMessagesToMainFrame(not_connectable.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); } @@ -510,16 +513,18 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, InitializeTestServer(); // Install the web connectable extension. - const Extension* chromium_connectable = LoadChromiumConnectableExtension(); + scoped_refptr<const Extension> chromium_connectable = + LoadChromiumConnectableExtension(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // If the background page closes after receipt of the message, it will still // reply to this message... EXPECT_EQ(OK, - CanConnectAndSendMessagesToMainFrame(chromium_connectable, + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get(), close_background_message())); // and be re-opened by receipt of a subsequent message. - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + EXPECT_EQ(OK, + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); } // Tests a web connectable extension that doesn't receive TLS channel id. @@ -529,20 +534,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, // Install the web connectable extension. chromium.org can connect to it, // google.com can't. - const Extension* chromium_connectable = LoadChromiumConnectableExtension(); - ASSERT_TRUE(chromium_connectable); + scoped_refptr<const Extension> chromium_connectable = + LoadChromiumConnectableExtension(); + ASSERT_TRUE(chromium_connectable.get()); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // The web connectable extension doesn't request the TLS channel ID, so it // doesn't get it, whether or not the page asks for it. EXPECT_EQ(std::string(), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(std::string(), - GetTlsChannelIdFromSendMessage(chromium_connectable, true)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); EXPECT_EQ(std::string(), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(std::string(), - GetTlsChannelIdFromSendMessage(chromium_connectable, true)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); } // Tests a web connectable extension that receives TLS channel id with a site @@ -551,21 +557,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, WebConnectableWithTlsChannelIdWithNonMatchingSite) { InitializeTestServer(); - const Extension* chromium_connectable = + scoped_refptr<const Extension> chromium_connectable = LoadChromiumConnectableExtensionWithTlsChannelId(); - ASSERT_TRUE(chromium_connectable); + ASSERT_TRUE(chromium_connectable.get()); ui_test_utils::NavigateToURL(browser(), google_com_url()); // The extension requests the TLS channel ID, but it doesn't get it for a // site that can't connect to it, regardless of whether the page asks for it. EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), - GetTlsChannelIdFromSendMessage(chromium_connectable, true)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(base::StringPrintf("%d", NAMESPACE_NOT_DEFINED), - GetTlsChannelIdFromSendMessage(chromium_connectable, true)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true)); } // Tests a web connectable extension that receives TLS channel id on a site @@ -574,21 +580,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, WebConnectableWithTlsChannelIdWithEmptyTlsChannelId) { InitializeTestServer(); - const Extension* chromium_connectable = + scoped_refptr<const Extension> chromium_connectable = LoadChromiumConnectableExtensionWithTlsChannelId(); - ASSERT_TRUE(chromium_connectable); + ASSERT_TRUE(chromium_connectable.get()); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // Since the extension requests the TLS channel ID, it gets it for a site that // can connect to it, but only if the page also asks to include it. EXPECT_EQ(std::string(), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(std::string(), - GetTlsChannelIdFromSendMessage(chromium_connectable, false)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), false)); // If the page does ask for it, it isn't empty. std::string tls_channel_id = - GetTlsChannelIdFromPortConnect(chromium_connectable, true); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); // Because the TLS channel ID has never been generated for this domain, // no TLS channel ID is reported. EXPECT_EQ(std::string(), tls_channel_id); @@ -601,20 +607,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, DISABLED_WebConnectableWithEmptyTlsChannelIdAndClosedBackgroundPage) { InitializeTestServer(); - const Extension* chromium_connectable = + scoped_refptr<const Extension> chromium_connectable = LoadChromiumConnectableExtensionWithTlsChannelId(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // If the page does ask for it, it isn't empty, even if the background page // closes upon receipt of the connect. std::string tls_channel_id = GetTlsChannelIdFromPortConnect( - chromium_connectable, true, close_background_message()); + chromium_connectable.get(), true, close_background_message()); // Because the TLS channel ID has never been generated for this domain, // no TLS channel ID is reported. EXPECT_EQ(std::string(), tls_channel_id); // A subsequent connect will still succeed, even if the background page was // previously closed. - tls_channel_id = GetTlsChannelIdFromPortConnect(chromium_connectable, true); + tls_channel_id = + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); // And the empty value is still retrieved. EXPECT_EQ(std::string(), tls_channel_id); } @@ -628,22 +635,26 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, EnablingAndDisabling) { InitializeTestServer(); - const Extension* chromium_connectable = LoadChromiumConnectableExtension(); - const Extension* not_connectable = LoadNotConnectableExtension(); + scoped_refptr<const Extension> chromium_connectable = + LoadChromiumConnectableExtension(); + scoped_refptr<const Extension> not_connectable = + LoadNotConnectableExtension(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + EXPECT_EQ(OK, + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToMainFrame(not_connectable)); + CanConnectAndSendMessagesToMainFrame(not_connectable.get())); DisableExtension(chromium_connectable->id()); EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); EnableExtension(chromium_connectable->id()); - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(chromium_connectable)); + EXPECT_EQ(OK, + CanConnectAndSendMessagesToMainFrame(chromium_connectable.get())); EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToMainFrame(not_connectable)); + CanConnectAndSendMessagesToMainFrame(not_connectable.get())); } // Tests connection from incognito tabs when the user denies the connection @@ -673,20 +684,22 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, // No connection because incognito-enabled hasn't been set for the app, and // the user denied our interactive request. - EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + EXPECT_EQ( + COULD_NOT_ESTABLISH_CONNECTION_ERROR, + CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); EXPECT_EQ(1, alert_tracker.GetAndResetAlertCount()); // Try again. User has already denied so alert not shown. - EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + EXPECT_EQ( + COULD_NOT_ESTABLISH_CONNECTION_ERROR, + CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); EXPECT_EQ(0, alert_tracker.GetAndResetAlertCount()); } // It's not possible to allow an app in incognito. ExtensionPrefs::Get(profile())->SetIsIncognitoEnabled(app->id(), true); EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); } IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, @@ -707,16 +720,17 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, IncognitoConnectability::ScopedAlertTracker::ALWAYS_DENY); // The alert doesn't show for extensions. - EXPECT_EQ( - COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToFrame(incognito_frame, extension, NULL)); + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, + CanConnectAndSendMessagesToFrame( + incognito_frame, extension.get(), NULL)); EXPECT_EQ(0, alert_tracker.GetAndResetAlertCount()); } // Allowing the extension in incognito mode will bypass the deny. ExtensionPrefs::Get(profile())->SetIsIncognitoEnabled(extension->id(), true); - EXPECT_EQ(OK, - CanConnectAndSendMessagesToFrame(incognito_frame, extension, NULL)); + EXPECT_EQ( + OK, + CanConnectAndSendMessagesToFrame(incognito_frame, extension.get(), NULL)); } // Tests connection from incognito tabs when the user accepts the connection @@ -742,18 +756,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, // Connection allowed even with incognito disabled, because the user // accepted the interactive request. - EXPECT_EQ(OK, CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + EXPECT_EQ( + OK, CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); EXPECT_EQ(1, alert_tracker.GetAndResetAlertCount()); // Try again. User has already allowed. - EXPECT_EQ(OK, CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + EXPECT_EQ( + OK, CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); EXPECT_EQ(0, alert_tracker.GetAndResetAlertCount()); } // Apps can't be allowed in incognito mode, but it's moot because it's // already allowed. ExtensionPrefs::Get(profile())->SetIsIncognitoEnabled(app->id(), true); - EXPECT_EQ(OK, CanConnectAndSendMessagesToFrame(incognito_frame, app, NULL)); + EXPECT_EQ(OK, + CanConnectAndSendMessagesToFrame(incognito_frame, app.get(), NULL)); } IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, @@ -774,16 +791,17 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, IncognitoConnectability::ScopedAlertTracker::ALWAYS_ALLOW); // No alert is shown. - EXPECT_EQ( - COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToFrame(incognito_frame, extension, NULL)); + EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, + CanConnectAndSendMessagesToFrame( + incognito_frame, extension.get(), NULL)); EXPECT_EQ(0, alert_tracker.GetAndResetAlertCount()); } // Allowing the extension in incognito mode is what allows connections. ExtensionPrefs::Get(profile())->SetIsIncognitoEnabled(extension->id(), true); - EXPECT_EQ(OK, - CanConnectAndSendMessagesToFrame(incognito_frame, extension, NULL)); + EXPECT_EQ( + OK, + CanConnectAndSendMessagesToFrame(incognito_frame, extension.get(), NULL)); } // Tests a connection from an iframe within a tab which doesn't have @@ -792,16 +810,16 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, FromIframeWithPermission) { InitializeTestServer(); - const Extension* extension = LoadChromiumConnectableExtension(); + scoped_refptr<const Extension> extension = LoadChromiumConnectableExtension(); ui_test_utils::NavigateToURL(browser(), google_com_url()); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToMainFrame(extension)); + CanConnectAndSendMessagesToMainFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); ASSERT_TRUE(AppendIframe(chromium_org_url())); - EXPECT_EQ(OK, CanConnectAndSendMessagesToIFrame(extension)); + EXPECT_EQ(OK, CanConnectAndSendMessagesToIFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForIFrame()); } @@ -811,16 +829,16 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, FromIframeWithoutPermission) { InitializeTestServer(); - const Extension* extension = LoadChromiumConnectableExtension(); + scoped_refptr<const Extension> extension = LoadChromiumConnectableExtension(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(extension)); + EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); ASSERT_TRUE(AppendIframe(google_com_url())); EXPECT_EQ(NAMESPACE_NOT_DEFINED, - CanConnectAndSendMessagesToIFrame(extension)); + CanConnectAndSendMessagesToIFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForIFrame()); } @@ -899,27 +917,27 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingWithTlsChannelIdTest, InitializeTestServer(); std::string expected_tls_channel_id_value = CreateTlsChannelId(); - const Extension* chromium_connectable = + scoped_refptr<const Extension> chromium_connectable = LoadChromiumConnectableExtensionWithTlsChannelId(); - ASSERT_TRUE(chromium_connectable); + ASSERT_TRUE(chromium_connectable.get()); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // Since the extension requests the TLS channel ID, it gets it for a site that // can connect to it, but only if the page also asks to send it. EXPECT_EQ(std::string(), - GetTlsChannelIdFromPortConnect(chromium_connectable, false)); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), false)); EXPECT_EQ(std::string(), - GetTlsChannelIdFromSendMessage(chromium_connectable, false)); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), false)); // If the page does ask to send the TLS channel ID, it's sent and non-empty. std::string tls_channel_id_from_port_connect = - GetTlsChannelIdFromPortConnect(chromium_connectable, true); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); EXPECT_NE(0u, tls_channel_id_from_port_connect.size()); // The same value is received by both connect and sendMessage. std::string tls_channel_id_from_send_message = - GetTlsChannelIdFromSendMessage(chromium_connectable, true); + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true); EXPECT_EQ(tls_channel_id_from_port_connect, tls_channel_id_from_send_message); // And since a TLS channel ID exists for the domain, the value received is @@ -930,18 +948,21 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingWithTlsChannelIdTest, // The TLS channel ID shouldn't change from one connection to the next... std::string tls_channel_id2 = - GetTlsChannelIdFromPortConnect(chromium_connectable, true); + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); EXPECT_EQ(tls_channel_id, tls_channel_id2); - tls_channel_id2 = GetTlsChannelIdFromSendMessage(chromium_connectable, true); + tls_channel_id2 = + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true); EXPECT_EQ(tls_channel_id, tls_channel_id2); // nor should it change when navigating away, revisiting the page and // requesting it again. ui_test_utils::NavigateToURL(browser(), google_com_url()); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); - tls_channel_id2 = GetTlsChannelIdFromPortConnect(chromium_connectable, true); + tls_channel_id2 = + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); EXPECT_EQ(tls_channel_id, tls_channel_id2); - tls_channel_id2 = GetTlsChannelIdFromSendMessage(chromium_connectable, true); + tls_channel_id2 = + GetTlsChannelIdFromSendMessage(chromium_connectable.get(), true); EXPECT_EQ(tls_channel_id, tls_channel_id2); } @@ -953,18 +974,19 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingWithTlsChannelIdTest, InitializeTestServer(); std::string expected_tls_channel_id_value = CreateTlsChannelId(); - const Extension* chromium_connectable = + scoped_refptr<const Extension> chromium_connectable = LoadChromiumConnectableExtensionWithTlsChannelId(); ui_test_utils::NavigateToURL(browser(), chromium_org_url()); // If the page does ask for it, it isn't empty, even if the background page // closes upon receipt of the connect. std::string tls_channel_id = GetTlsChannelIdFromPortConnect( - chromium_connectable, true, close_background_message()); + chromium_connectable.get(), true, close_background_message()); EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); // A subsequent connect will still succeed, even if the background page was // previously closed. - tls_channel_id = GetTlsChannelIdFromPortConnect(chromium_connectable, true); + tls_channel_id = + GetTlsChannelIdFromPortConnect(chromium_connectable.get(), true); // And the expected value is still retrieved. EXPECT_EQ(expected_tls_channel_id_value, tls_channel_id); } @@ -1023,12 +1045,13 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, HostedAppOnWebsite) { // The presence of the hosted app shouldn't give the ability to send messages. ui_test_utils::NavigateToURL(browser(), chromium_org_url()); - EXPECT_EQ(NAMESPACE_NOT_DEFINED, CanConnectAndSendMessagesToMainFrame(app)); + EXPECT_EQ(NAMESPACE_NOT_DEFINED, + CanConnectAndSendMessagesToMainFrame(app.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); // Once a connectable extension is installed, it should. - const Extension* extension = LoadChromiumConnectableExtension(); - EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(extension)); + scoped_refptr<const Extension> extension = LoadChromiumConnectableExtension(); + EXPECT_EQ(OK, CanConnectAndSendMessagesToMainFrame(extension.get())); EXPECT_FALSE(AreAnyNonWebApisDefinedForMainFrame()); } @@ -1057,7 +1080,7 @@ IN_PROC_BROWSER_TEST_F(ExternallyConnectableMessagingTest, ui_test_utils::NavigateToURL(browser(), chromium_org_url()); EXPECT_EQ(COULD_NOT_ESTABLISH_CONNECTION_ERROR, - CanConnectAndSendMessagesToMainFrame(invalid)); + CanConnectAndSendMessagesToMainFrame(invalid.get())); } #endif // !defined(OS_WIN) - http://crbug.com/350517. diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 3ec1c33..3530824 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -937,7 +937,7 @@ void ExtensionService::DisableUserExtensions( extension != to_disable.end(); ++extension) { if ((*extension)->was_installed_by_default() && extension_urls::IsWebstoreUpdateUrl( - extensions::ManifestURL::GetUpdateURL(*extension))) + extensions::ManifestURL::GetUpdateURL(extension->get()))) continue; const std::string& id = (*extension)->id(); if (except_ids.end() == std::find(except_ids.begin(), except_ids.end(), id)) @@ -1522,7 +1522,7 @@ void ExtensionService::CheckPermissionsIncrease(const Extension* extension, // to a version that requires additional privileges. is_privilege_increase = extensions::PermissionMessageProvider::Get()->IsPrivilegeIncrease( - granted_permissions, + granted_permissions.get(), extension->permissions_data()->active_permissions().get(), extension->GetType()); } diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index d297132..f9ec4cd 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -1124,7 +1124,7 @@ class ExtensionServiceTest : public extensions::ExtensionServiceTestBase, content::WindowedNotificationObserver observer( extensions::NOTIFICATION_CRX_INSTALLER_DONE, - content::Source<extensions::CrxInstaller>(installer)); + content::Source<extensions::CrxInstaller>(installer.get())); installer->InstallCrx(crx_path); diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index 36f3894..3e17480 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc @@ -415,7 +415,7 @@ void ExtensionSystemImpl::Shared::Shutdown() { extension_warning_service_->RemoveObserver( extension_warning_badge_service_.get()); } - if (content_verifier_) + if (content_verifier_.get()) content_verifier_->Shutdown(); if (extension_service_) extension_service_->Shutdown(); diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 0f6f9e4..35e51b2 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -409,7 +409,7 @@ void ExtensionToolbarModel::Populate(const ExtensionIdList& positions, size_t items_count = toolbar_items_.size(); for (size_t i = 0; i < items_count; i++) { - const Extension* extension = toolbar_items_.back(); + const Extension* extension = toolbar_items_.back().get(); // By popping the extension here (before calling BrowserActionRemoved), // we will not shrink visible count by one after BrowserActionRemoved // calls SetVisibleCount. @@ -433,8 +433,9 @@ void ExtensionToolbarModel::Populate(const ExtensionIdList& positions, if (iter->get() != NULL) { toolbar_items_.push_back(*iter); FOR_EACH_OBSERVER( - Observer, observers_, ToolbarExtensionAdded( - *iter, toolbar_items_.size() - 1)); + Observer, + observers_, + ToolbarExtensionAdded(iter->get(), toolbar_items_.size() - 1)); } } for (ExtensionList::const_iterator iter = unsorted.begin(); @@ -442,8 +443,9 @@ void ExtensionToolbarModel::Populate(const ExtensionIdList& positions, if (iter->get() != NULL) { toolbar_items_.push_back(*iter); FOR_EACH_OBSERVER( - Observer, observers_, ToolbarExtensionAdded( - *iter, toolbar_items_.size() - 1)); + Observer, + observers_, + ToolbarExtensionAdded(iter->get(), toolbar_items_.size() - 1)); } } @@ -506,7 +508,7 @@ void ExtensionToolbarModel::MaybeUpdateVisibilityPref( void ExtensionToolbarModel::MaybeUpdateVisibilityPrefs() { for (size_t i = 0u; i < toolbar_items_.size(); ++i) - MaybeUpdateVisibilityPref(toolbar_items_[i], i); + MaybeUpdateVisibilityPref(toolbar_items_[i].get(), i); } int ExtensionToolbarModel::IncognitoIndexToOriginal(int incognito_index) { @@ -602,7 +604,7 @@ void ExtensionToolbarModel::EnsureVisibility( extension != toolbar_items_.end(); ++extension) { if ((*extension)->id() == (*it)) { if (extension - toolbar_items_.begin() >= visible_icon_count_) - MoveExtensionIcon(*extension, 0); + MoveExtensionIcon(extension->get(), 0); break; } } diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index b23ab50..49446b3 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -76,8 +76,9 @@ class ExtensionUITest : public testing::Test { return static_cast<base::DictionaryValue*>(value); } - const Extension* CreateExtension(const std::string& name, - ListBuilder& permissions) { + const scoped_refptr<const Extension> CreateExtension( + const std::string& name, + ListBuilder& permissions) { const std::string kId = crx_file::id_util::GenerateId(name); scoped_refptr<const Extension> extension = ExtensionBuilder().SetManifest( @@ -92,7 +93,7 @@ class ExtensionUITest : public testing::Test { .Build(); ExtensionRegistry::Get(profile())->AddEnabled(extension); - PermissionsUpdater(profile()).InitializePermissions(extension); + PermissionsUpdater(profile()).InitializePermissions(extension.get()); return extension; } @@ -320,15 +321,13 @@ TEST_F(ExtensionUITest, ExtensionUIAllUrlsCheckbox) { new FeatureSwitch::ScopedOverride( FeatureSwitch::scripts_require_action(), true)); // Two extensions - one with all urls, one without. - const Extension* all_urls_extension = - CreateExtension("all_urls", - ListBuilder().Append(kAllHostsPermission).Pass()); - const Extension* no_urls_extension = + scoped_refptr<const Extension> all_urls_extension = CreateExtension( + "all_urls", ListBuilder().Append(kAllHostsPermission).Pass()); + scoped_refptr<const Extension> no_urls_extension = CreateExtension("no urls", ListBuilder().Pass()); - scoped_ptr<base::DictionaryValue> value( - handler()->CreateExtensionDetailValue( - all_urls_extension, std::vector<ExtensionPage>(), NULL)); + scoped_ptr<base::DictionaryValue> value(handler()->CreateExtensionDetailValue( + all_urls_extension.get(), std::vector<ExtensionPage>(), NULL)); bool result = false; const std::string kWantsAllUrls = "wantsAllUrls"; const std::string kAllowAllUrls = "allowAllUrls"; @@ -345,7 +344,7 @@ TEST_F(ExtensionUITest, ExtensionUIAllUrlsCheckbox) { // Now the extension should both want and have all urls. value.reset(handler()->CreateExtensionDetailValue( - all_urls_extension, std::vector<ExtensionPage>(), NULL)); + all_urls_extension.get(), std::vector<ExtensionPage>(), NULL)); EXPECT_TRUE(value->GetBoolean(kWantsAllUrls, &result)); EXPECT_TRUE(result); EXPECT_TRUE(value->GetBoolean(kAllowAllUrls, &result)); @@ -353,7 +352,7 @@ TEST_F(ExtensionUITest, ExtensionUIAllUrlsCheckbox) { // The other extension should neither want nor have all urls. value.reset(handler()->CreateExtensionDetailValue( - no_urls_extension, std::vector<ExtensionPage>(), NULL)); + no_urls_extension.get(), std::vector<ExtensionPage>(), NULL)); EXPECT_TRUE(value->GetBoolean(kWantsAllUrls, &result)); EXPECT_FALSE(result); EXPECT_TRUE(value->GetBoolean(kAllowAllUrls, &result)); @@ -366,7 +365,7 @@ TEST_F(ExtensionUITest, ExtensionUIAllUrlsCheckbox) { // Even though the extension has the all urls preference, the checkbox // shouldn't show up with the switch off. value.reset(handler()->CreateExtensionDetailValue( - all_urls_extension, std::vector<ExtensionPage>(), NULL)); + all_urls_extension.get(), std::vector<ExtensionPage>(), NULL)); EXPECT_TRUE(value->GetBoolean(kWantsAllUrls, &result)); EXPECT_FALSE(result); EXPECT_TRUE(value->GetBoolean(kAllowAllUrls, &result)); @@ -379,7 +378,7 @@ TEST_F(ExtensionUITest, ExtensionUIAllUrlsCheckbox) { // Even though the extension has all_urls permission, the checkbox shouldn't // show up without the switch. value.reset(handler()->CreateExtensionDetailValue( - all_urls_extension, std::vector<ExtensionPage>(), NULL)); + all_urls_extension.get(), std::vector<ExtensionPage>(), NULL)); EXPECT_TRUE(value->GetBoolean(kWantsAllUrls, &result)); EXPECT_FALSE(result); EXPECT_TRUE(value->GetBoolean(kAllowAllUrls, &result)); diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc index 0ed176c..c01e8da 100644 --- a/chrome/browser/extensions/external_install_error.cc +++ b/chrome/browser/extensions/external_install_error.cc @@ -369,7 +369,7 @@ void ExternalInstallError::OnDialogReady( prompt_ = prompt; if (alert_type_ == BUBBLE_ALERT) { - global_error_.reset(new ExternalInstallBubbleAlert(this, prompt_)); + global_error_.reset(new ExternalInstallBubbleAlert(this, prompt_.get())); error_service_->AddGlobalError(global_error_.get()); Browser* browser = diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index d4ab6c9..bb1e647 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -394,7 +394,7 @@ void ExternalProviderImpl::CreateExternalProviders( #endif // Policies are mandatory so they can't be skipped with command line flag. - if (external_loader) { + if (external_loader.get()) { provider_list->push_back( linked_ptr<ExternalProviderInterface>( new ExternalProviderImpl( diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index ebd3a8d..7ef862f 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc @@ -446,7 +446,7 @@ ExtensionIdSet InstallVerifier::GetExtensionsToVerify() const { for (ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { - if (NeedsVerification(**iter)) + if (NeedsVerification(*iter->get())) result.insert((*iter)->id()); } return result; @@ -494,7 +494,7 @@ void InstallVerifier::OnVerificationComplete(bool success, OperationType type) { ++iter) { int disable_reasons = prefs_->GetDisableReasons((*iter)->id()); if (disable_reasons & Extension::DISABLE_NOT_VERIFIED && - !MustRemainDisabled(*iter, NULL, NULL)) { + !MustRemainDisabled(iter->get(), NULL, NULL)) { prefs_->RemoveDisableReason((*iter)->id(), Extension::DISABLE_NOT_VERIFIED); } diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 363c7d3..71fc70e 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -202,7 +202,8 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) { error = errors::kDisabledByPolicy; extension = NULL; } else if (!extension_prefs_->IsExtensionDisabled(extension->id()) && - policy->MustRemainDisabled(extension, &disable_reason, NULL)) { + policy->MustRemainDisabled( + extension.get(), &disable_reason, NULL)) { extension_prefs_->SetExtensionState(extension->id(), Extension::DISABLED); extension_prefs_->AddDisableReason(extension->id(), disable_reason); force_disabled = true; @@ -330,7 +331,7 @@ void InstalledLoader::LoadAllExtensions() { for (ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { - const Extension* extension = *iter; + const Extension* extension = iter->get(); Manifest::Location location = extension->location(); Manifest::Type type = extension->GetType(); @@ -498,7 +499,7 @@ void InstalledLoader::LoadAllExtensions() { RecordDisableReasons(extension_prefs_->GetDisableReasons((*ex)->id())); if (Manifest::IsExternalLocation((*ex)->location())) { // See loop above for ENABLED. - if (ManifestURL::UpdatesFromGallery(*ex)) { + if (ManifestURL::UpdatesFromGallery(ex->get())) { UMA_HISTOGRAM_ENUMERATION("Extensions.ExternalItemState", EXTERNAL_ITEM_WEBSTORE_DISABLED, EXTERNAL_ITEM_MAX_ITEMS); diff --git a/chrome/browser/extensions/location_bar_controller.cc b/chrome/browser/extensions/location_bar_controller.cc index 69491ba..21aa377 100644 --- a/chrome/browser/extensions/location_bar_controller.cc +++ b/chrome/browser/extensions/location_bar_controller.cc @@ -47,9 +47,9 @@ std::vector<ExtensionAction*> LocationBarController::GetCurrentActions() { // one action per extension. If clicking on an active script action ever // has a response, then we will need to split the actions. ExtensionAction* action = - page_action_controller_->GetActionForExtension(*iter); + page_action_controller_->GetActionForExtension(iter->get()); if (!action) - action = active_script_controller_->GetActionForExtension(*iter); + action = active_script_controller_->GetActionForExtension(iter->get()); if (action) current_actions.push_back(action); } diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index f28ecdd..1b13c67 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -64,7 +64,7 @@ scoped_refptr<const PermissionSet> GetBoundedActivePermissions( // If the extension has used the optional permissions API, it will have a // custom set of active permissions defined in the extension prefs. Here, // we update the extension's active permissions based on the prefs. - if (!active_permissions) + if (!active_permissions.get()) return extension->permissions_data()->active_permissions(); scoped_refptr<const PermissionSet> required_permissions = @@ -75,16 +75,17 @@ scoped_refptr<const PermissionSet> GetBoundedActivePermissions( // a) active permissions must be a subset of optional + default permissions // b) active permissions must contains all default permissions scoped_refptr<PermissionSet> total_permissions = PermissionSet::CreateUnion( - required_permissions, + required_permissions.get(), PermissionsParser::GetOptionalPermissions(extension)); // Make sure the active permissions contain no more than optional + default. scoped_refptr<PermissionSet> adjusted_active = - PermissionSet::CreateIntersection(total_permissions, active_permissions); + PermissionSet::CreateIntersection(total_permissions.get(), + active_permissions.get()); // Make sure the active permissions contain the default permissions. - adjusted_active = - PermissionSet::CreateUnion(required_permissions, adjusted_active); + adjusted_active = PermissionSet::CreateUnion(required_permissions.get(), + adjusted_active.get()); return adjusted_active; } @@ -194,7 +195,7 @@ void PermissionsUpdater::InitializePermissions(const Extension* extension) { // For example, the union of <all_urls> and "example.com" is <all_urls>, so // we may lose "example.com". However, "example.com" is important once // <all_urls> is stripped during withholding. - if (active_permissions) { + if (active_permissions.get()) { granted_explicit_hosts.AddPatterns( FilterSingleOriginPermissions(active_permissions->explicit_hosts(), bounded_active->explicit_hosts())); diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 88d85e3..63d00de 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc @@ -218,7 +218,7 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) { // Verify that the permission notification was sent correctly. ASSERT_TRUE(listener.received_notification()); - ASSERT_EQ(extension, listener.extension()); + ASSERT_EQ(extension.get(), listener.extension()); ASSERT_EQ(UpdatedExtensionPermissionsInfo::ADDED, listener.reason()); ASSERT_EQ(*delta.get(), *listener.permissions()); @@ -254,7 +254,7 @@ TEST_F(PermissionsUpdaterTest, AddAndRemovePermissions) { // Verify that the notification was correct. ASSERT_TRUE(listener.received_notification()); - ASSERT_EQ(extension, listener.extension()); + ASSERT_EQ(extension.get(), listener.extension()); ASSERT_EQ(UpdatedExtensionPermissionsInfo::REMOVED, listener.reason()); ASSERT_EQ(*delta.get(), *listener.permissions()); @@ -304,7 +304,7 @@ TEST_F(PermissionsUpdaterTest, WithholdAllHosts) { all_patterns, all_patterns, Manifest::INTERNAL); const PermissionsData* permissions_data = extension->permissions_data(); PermissionsUpdater updater(profile_.get()); - updater.InitializePermissions(extension); + updater.InitializePermissions(extension.get()); // At first, the active permissions should have only the safe patterns and // the withheld permissions should have only the all host patterns. @@ -322,7 +322,7 @@ TEST_F(PermissionsUpdaterTest, WithholdAllHosts) { all_host_patterns)); // Then, we grant the withheld all-hosts permissions. - updater.GrantWithheldImpliedAllHosts(extension); + updater.GrantWithheldImpliedAllHosts(extension.get()); // Now, active permissions should have all patterns, and withheld permissions // should have none. EXPECT_TRUE(SetsAreEqual( @@ -341,7 +341,7 @@ TEST_F(PermissionsUpdaterTest, WithholdAllHosts) { .empty()); // Finally, we revoke the all hosts permissions. - updater.WithholdImpliedAllHosts(extension); + updater.WithholdImpliedAllHosts(extension.get()); // We should be back to our initial state - all_hosts should be withheld, and // the safe patterns should be granted. @@ -362,7 +362,7 @@ TEST_F(PermissionsUpdaterTest, WithholdAllHosts) { extension = CreateExtensionWithPermissions( all_patterns, all_patterns, Manifest::COMPONENT); permissions_data = extension->permissions_data(); - updater.InitializePermissions(extension); + updater.InitializePermissions(extension.get()); EXPECT_TRUE(SetsAreEqual( permissions_data->active_permissions()->scriptable_hosts().patterns(), all_patterns)); @@ -383,7 +383,7 @@ TEST_F(PermissionsUpdaterTest, WithholdAllHosts) { extension = CreateExtensionWithPermissions( all_patterns, all_patterns, Manifest::INTERNAL); permissions_data = extension->permissions_data(); - updater.InitializePermissions(extension); + updater.InitializePermissions(extension.get()); EXPECT_TRUE(SetsAreEqual( permissions_data->active_permissions()->scriptable_hosts().patterns(), all_patterns)); diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index 4140ebd..2395966 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc @@ -76,7 +76,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, LoadExtension(test_data_dir_.AppendASCII("api_test") .AppendASCII("browser_action") .AppendASCII("popup")); - ASSERT_TRUE(popup); + ASSERT_TRUE(popup.get()); // No background host was added. EXPECT_EQ(0u, pm->background_hosts().size()); diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index 56e5118..6b6c1c7 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -696,8 +696,9 @@ bool SandboxedUnpacker::RewriteImageFiles(SkBitmap* install_icon) { } } - const std::string& install_icon_path = IconsInfo::GetIcons(extension_).Get( - extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER); + const std::string& install_icon_path = + IconsInfo::GetIcons(extension_.get()).Get( + extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_BIGGER); // Write our parsed images back to disk as well. for (size_t i = 0; i < images.size(); ++i) { diff --git a/chrome/browser/extensions/settings_api_helpers.cc b/chrome/browser/extensions/settings_api_helpers.cc index df73df2..2fcd9c8 100644 --- a/chrome/browser/extensions/settings_api_helpers.cc +++ b/chrome/browser/extensions/settings_api_helpers.cc @@ -27,7 +27,7 @@ const Extension* FindOverridingExtension( for (ExtensionSet::const_iterator it = extensions.begin(); it != extensions.end(); ++it) { - const SettingsOverrides* settings = SettingsOverrides::Get(*it); + const SettingsOverrides* settings = SettingsOverrides::Get(it->get()); if (settings) { if (type == BUBBLE_TYPE_HOME_PAGE && !settings->homepage) continue; @@ -56,7 +56,7 @@ const Extension* FindOverridingExtension( continue; // Not primary. // Found the primary extension. - return *it; + return it->get(); } } diff --git a/chrome/browser/extensions/shared_module_service_unittest.cc b/chrome/browser/extensions/shared_module_service_unittest.cc index 9f399984..ca12165 100644 --- a/chrome/browser/extensions/shared_module_service_unittest.cc +++ b/chrome/browser/extensions/shared_module_service_unittest.cc @@ -114,7 +114,7 @@ TEST_F(SharedModuleServiceUnitTest, AddDependentSharedModules) { // Try to satisfy imports for the extension. This should queue the imported // module's installation. - service()->shared_module_service()->SatisfyImports(extension); + service()->shared_module_service()->SatisfyImports(extension.get()); EXPECT_TRUE(pending_extension_manager->IsIdPending(import_id)); } @@ -135,13 +135,13 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUninstall) { .SetID(crx_file::id_util::GenerateId("shared_module")) .Build(); - EXPECT_TRUE(InstallExtension(shared_module, false)); + EXPECT_TRUE(InstallExtension(shared_module.get(), false)); std::string extension_id = crx_file::id_util::GenerateId("extension_id"); // Create and install an extension that imports our new module. scoped_refptr<Extension> importing_extension = CreateExtensionImportingModule(shared_module->id(), extension_id, "1.0"); - EXPECT_TRUE(InstallExtension(importing_extension, false)); + EXPECT_TRUE(InstallExtension(importing_extension.get(), false)); // Uninstall the extension that imports our module. base::string16 error; @@ -174,7 +174,7 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) { .AddFlags(Extension::FROM_WEBSTORE) .SetID(crx_file::id_util::GenerateId("shared_module_1")) .Build(); - EXPECT_TRUE(InstallExtension(shared_module_1, false)); + EXPECT_TRUE(InstallExtension(shared_module_1.get(), false)); scoped_ptr<base::DictionaryValue> manifest_2 = DictionaryBuilder() @@ -190,7 +190,7 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) { .AddFlags(Extension::FROM_WEBSTORE) .SetID(crx_file::id_util::GenerateId("shared_module_2")) .Build(); - EXPECT_TRUE(InstallExtension(shared_module_2, false)); + EXPECT_TRUE(InstallExtension(shared_module_2.get(), false)); std::string extension_id = crx_file::id_util::GenerateId("extension_id"); @@ -199,7 +199,7 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) { CreateExtensionImportingModule(shared_module_1->id(), extension_id, "1.0"); - EXPECT_TRUE(InstallExtension(importing_extension_1, false)); + EXPECT_TRUE(InstallExtension(importing_extension_1.get(), false)); // Create and install a new version of the extension that imports our new // module 2. @@ -207,7 +207,7 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) { CreateExtensionImportingModule(shared_module_2->id(), extension_id, "1.1"); - EXPECT_TRUE(InstallExtension(importing_extension_2, true)); + EXPECT_TRUE(InstallExtension(importing_extension_2.get(), true)); // Since the extension v1.1 depends the module 2 insteand module 1. // So the module 1 should be uninstalled. @@ -220,7 +220,7 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) { // module. scoped_refptr<Extension> importing_extension_3 = CreateExtensionImportingModule("", extension_id, "1.2"); - EXPECT_TRUE(InstallExtension(importing_extension_3, true)); + EXPECT_TRUE(InstallExtension(importing_extension_3.get(), true)); // Since the extension v1.2 does not depend any module, so the all models // should have been uninstalled. @@ -254,21 +254,21 @@ TEST_F(SharedModuleServiceUnitTest, WhitelistedImports) { .SetID(crx_file::id_util::GenerateId("shared_module")) .Build(); - EXPECT_TRUE(InstallExtension(shared_module, false)); + EXPECT_TRUE(InstallExtension(shared_module.get(), false)); // Create and install an extension with the whitelisted ID. scoped_refptr<Extension> whitelisted_extension = CreateExtensionImportingModule(shared_module->id(), whitelisted_id, "1.0"); - EXPECT_TRUE(InstallExtension(whitelisted_extension, false)); + EXPECT_TRUE(InstallExtension(whitelisted_extension.get(), false)); // Try to install an extension with an ID that is not whitelisted. scoped_refptr<Extension> nonwhitelisted_extension = CreateExtensionImportingModule(shared_module->id(), nonwhitelisted_id, "1.0"); - EXPECT_FALSE(InstallExtension(nonwhitelisted_extension, false)); + EXPECT_FALSE(InstallExtension(nonwhitelisted_extension.get(), false)); } } // namespace extensions diff --git a/chrome/browser/extensions/test_blacklist_state_fetcher.cc b/chrome/browser/extensions/test_blacklist_state_fetcher.cc index 879e189..986da8f 100644 --- a/chrome/browser/extensions/test_blacklist_state_fetcher.cc +++ b/chrome/browser/extensions/test_blacklist_state_fetcher.cc @@ -37,7 +37,7 @@ TestBlacklistStateFetcher::TestBlacklistStateFetcher( scoped_refptr<net::TestURLRequestContextGetter> context = new net::TestURLRequestContextGetter( base::MessageLoopProxy::current()); - fetcher_->SetURLRequestContextForTest(context); + fetcher_->SetURLRequestContextForTest(context.get()); } TestBlacklistStateFetcher::~TestBlacklistStateFetcher() { diff --git a/chrome/browser/extensions/updater/extension_downloader.cc b/chrome/browser/extensions/updater/extension_downloader.cc index 5846380..264e461 100644 --- a/chrome/browser/extensions/updater/extension_downloader.cc +++ b/chrome/browser/extensions/updater/extension_downloader.cc @@ -189,7 +189,7 @@ ExtensionDownloader::ExtensionDownloader( base::Unretained(this))), extension_cache_(NULL) { DCHECK(delegate_); - DCHECK(request_context_); + DCHECK(request_context_.get()); } ExtensionDownloader::~ExtensionDownloader() {} @@ -455,7 +455,7 @@ void ExtensionDownloader::CreateManifestFetcher() { manifest_fetcher_.reset(net::URLFetcher::Create( kManifestFetcherId, manifests_queue_.active_request()->full_url(), net::URLFetcher::GET, this)); - manifest_fetcher_->SetRequestContext(request_context_); + manifest_fetcher_->SetRequestContext(request_context_.get()); manifest_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES | net::LOAD_DISABLE_CACHE); @@ -725,7 +725,7 @@ void ExtensionDownloader::CreateExtensionFetcher() { const ExtensionFetch* fetch = extensions_queue_.active_request(); extension_fetcher_.reset(net::URLFetcher::Create( kExtensionFetcherId, fetch->url, net::URLFetcher::GET, this)); - extension_fetcher_->SetRequestContext(request_context_); + extension_fetcher_->SetRequestContext(request_context_.get()); extension_fetcher_->SetAutomaticallyRetryOnNetworkChanges(3); int load_flags = net::LOAD_DISABLE_CACHE; diff --git a/chrome/browser/extensions/user_script_loader.cc b/chrome/browser/extensions/user_script_loader.cc index eb29bae..ea22c45 100644 --- a/chrome/browser/extensions/user_script_loader.cc +++ b/chrome/browser/extensions/user_script_loader.cc @@ -84,7 +84,7 @@ bool LoadScriptContent(const ExtensionId& extension_id, LOG(WARNING) << "Failed to load user script file: " << path.value(); return false; } - if (verifier) { + if (verifier.get()) { content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE, base::Bind(&VerifyContent, @@ -207,7 +207,7 @@ void LoadScriptsOnFileThread(scoped_ptr<UserScriptList> user_scripts, LoadScriptsCallback callback) { DCHECK(user_scripts.get()); LoadUserScripts( - user_scripts.get(), extensions_info, added_script_ids, verifier); + user_scripts.get(), extensions_info, added_script_ids, verifier.get()); scoped_ptr<base::SharedMemory> memory = Serialize(*user_scripts); BrowserThread::PostTask( BrowserThread::UI, diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 412be96..1a8ce8dd9 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -308,10 +308,10 @@ void WebstoreInstaller::Start() { ExtensionService* extension_service = ExtensionSystem::Get(profile_)->extension_service(); - if (approval_.get() && approval_->dummy_extension) { + if (approval_.get() && approval_->dummy_extension.get()) { SharedModuleService::ImportStatus status = extension_service->shared_module_service()->CheckImports( - approval_->dummy_extension, + approval_->dummy_extension.get(), &pending_modules_, &pending_modules_); // For this case, it is because some imports are not shared modules. diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index dc9ea0e..dd2ac5c 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -132,7 +132,7 @@ void WebstoreStandaloneInstaller::CompleteInstall( void WebstoreStandaloneInstaller::ProceedWithInstallPrompt() { install_prompt_ = CreateInstallPrompt(); - if (install_prompt_) { + if (install_prompt_.get()) { ShowInstallUI(); // Control flow finishes up in InstallUIProceed or InstallUIAbort. } else { @@ -349,7 +349,8 @@ void WebstoreStandaloneInstaller::InstallUIProceed() { // If the target extension has already been installed ephemerally and is // up to date, it can be promoted to a regular installed extension and // downloading from the Web Store is not necessary. - const Extension* extension_to_install = GetLocalizedExtensionForDisplay(); + scoped_refptr<const Extension> extension_to_install = + GetLocalizedExtensionForDisplay(); if (!extension_to_install) { CompleteInstall(webstore_install::INVALID_MANIFEST, kInvalidManifestError); @@ -421,7 +422,8 @@ void WebstoreStandaloneInstaller::OnExtensionInstallFailure( } void WebstoreStandaloneInstaller::ShowInstallUI() { - const Extension* localized_extension = GetLocalizedExtensionForDisplay(); + scoped_refptr<const Extension> localized_extension = + GetLocalizedExtensionForDisplay(); if (!localized_extension) { CompleteInstall(webstore_install::INVALID_MANIFEST, kInvalidManifestError); return; |