diff options
Diffstat (limited to 'chrome/browser/extensions/api')
15 files changed, 35 insertions, 31 deletions
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.cc b/chrome/browser/extensions/api/content_settings/content_settings_api.cc index 3f993a7..1f07c04 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc @@ -143,10 +143,10 @@ bool ContentSettingsContentSettingGetFunction::RunImpl() { } map = profile()->GetOffTheRecordProfile()->GetHostContentSettingsMap(); cookie_settings = CookieSettings::Factory::GetForProfile( - profile()->GetOffTheRecordProfile()); + profile()->GetOffTheRecordProfile()).get(); } else { map = profile()->GetHostContentSettingsMap(); - cookie_settings = CookieSettings::Factory::GetForProfile(profile()); + cookie_settings = CookieSettings::Factory::GetForProfile(profile()).get(); } ContentSetting setting; diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index 034bb23..b142e36 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc @@ -25,7 +25,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) { HostContentSettingsMap* map = browser()->profile()->GetHostContentSettingsMap(); CookieSettings* cookie_settings = - CookieSettings::Factory::GetForProfile(browser()->profile()); + CookieSettings::Factory::GetForProfile(browser()->profile()).get(); // Check default content settings by using an unknown URL. GURL example_url("http://www.example.com"); diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 25aecca..d111843 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -277,7 +277,7 @@ base::Value* SerializePageInfo(RenderViewHost* rvh) { if (!web_contents) return NULL; - DevToolsAgentHost* agent_host = DevToolsAgentHost::GetOrCreateFor(rvh); + DevToolsAgentHost* agent_host = DevToolsAgentHost::GetOrCreateFor(rvh).get(); base::DictionaryValue* dictionary = new base::DictionaryValue(); diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 1642e47..4b7f549 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -98,7 +98,7 @@ const Extension* GetExtensionByPath(const ExtensionSet* extensions, for (ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { if ((*iter)->path() == extension_path) - return *iter; + return iter->get(); } return NULL; } @@ -383,7 +383,7 @@ bool DeveloperPrivateGetItemsInfoFunction::RunImpl() { for (ExtensionSet::const_iterator iter = items.begin(); iter != items.end(); ++iter) { - const Extension& item = **iter; + const Extension& item = *iter->get(); // Don't show component extensions because they are only extensions as an // implementation detail of Chrome. diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc index 5bb271c..5f6b779 100644 --- a/chrome/browser/extensions/api/dial/dial_api.cc +++ b/chrome/browser/extensions/api/dial/dial_api.cc @@ -152,7 +152,7 @@ DialDiscoverNowFunction::DialDiscoverNowFunction() bool DialDiscoverNowFunction::Prepare() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(profile()); - dial_ = DialAPIFactory::GetInstance()->GetForProfile(profile()); + dial_ = DialAPIFactory::GetInstance()->GetForProfile(profile()).get(); return true; } diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index 9db5cb9..8eacf45 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -701,7 +701,7 @@ class TestProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler { network_delegate, blob_storage_controller_->GetBlobDataFromUrl(request->url()), file_system_context_, - base::MessageLoopProxy::current()); + base::MessageLoopProxy::current().get()); } private: diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index 1540db0..468a1e99 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -927,7 +927,7 @@ class RemoveCachedAuthTokenFunctionTest : public ExtensionBrowserTest { bool InvalidateDefaultToken() { scoped_refptr<IdentityRemoveCachedAuthTokenFunction> func( new IdentityRemoveCachedAuthTokenFunction); - func->set_extension(utils::CreateEmptyExtension(kExtensionId)); + func->set_extension(utils::CreateEmptyExtension(kExtensionId).get()); return utils::RunFunction( func.get(), std::string("[{\"token\": \"") + kAccessToken + "\"}]", @@ -1061,8 +1061,8 @@ IN_PROC_BROWSER_TEST_F(LaunchWebAuthFlowFunctionTest, LoadFailed) { std::string args = "[{\"interactive\": true, \"url\": \"" + auth_url.spec() + "\"}]"; - std::string error = utils::RunFunctionAndReturnError(function, args, - browser()); + std::string error = + utils::RunFunctionAndReturnError(function.get(), args, browser()); EXPECT_EQ(std::string(errors::kPageLoadFailure), error); } diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 4ad1ee6..c855b83 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -207,7 +207,7 @@ void AddExtensionInfo(const ExtensionSet& extensions, ExtensionInfoList* extension_list) { for (ExtensionSet::const_iterator iter = extensions.begin(); iter != extensions.end(); ++iter) { - const Extension& extension = **iter; + const Extension& extension = *iter->get(); if (extension.location() == Manifest::COMPONENT) continue; // Skip built-in extensions. @@ -297,10 +297,8 @@ class SafeManifestJSONParser : public UtilityProcessHostClient { void StartWorkOnIOThread() { CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - UtilityProcessHost* host = - UtilityProcessHost::Create( - this, - base::MessageLoopProxy::current()); + UtilityProcessHost* host = UtilityProcessHost::Create( + this, base::MessageLoopProxy::current().get()); host->EnableZygote(); host->Send(new ChromeUtilityMsg_ParseJSON(manifest_)); } diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index 6d0f68d..fa1246b 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -440,7 +440,7 @@ bool MediaGalleriesPrivateGetHandlersFunction::RunImpl() { for (ExtensionSet::const_iterator iter = service->extensions()->begin(); iter != service->extensions()->end(); ++iter) { - const Extension* extension = *iter; + const Extension* extension = iter->get(); if (profile_->IsOffTheRecord() && !service->IsIncognitoEnabled(extension->id())) continue; diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.cc b/chrome/browser/extensions/api/page_capture/page_capture_api.cc index 2d53b2c..62a800e 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.cc @@ -103,8 +103,10 @@ void PageCaptureSaveAsMHTMLFunction::TemporaryFileCreated(bool success) { // Setup a ShareableFileReference so the temporary file gets deleted // once it is no longer used. mhtml_file_ = ShareableFileReference::GetOrCreate( - mhtml_path_, ShareableFileReference::DELETE_ON_FINAL_RELEASE, - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)); + mhtml_path_, + ShareableFileReference::DELETE_ON_FINAL_RELEASE, + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE) + .get()); } BrowserThread::PostTask( BrowserThread::UI, FROM_HERE, diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index f227114..c758578 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -68,7 +68,7 @@ bool PermissionsContainsFunction::RunImpl() { bool PermissionsGetAllFunction::RunImpl() { scoped_ptr<Permissions> permissions = - helpers::PackPermissionSet(GetExtension()->GetActivePermissions()); + helpers::PackPermissionSet(GetExtension()->GetActivePermissions().get()); results_ = GetAll::Results::Create(*permissions); return true; } diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc index 55297dd..7b18e78 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.cc +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc @@ -99,8 +99,8 @@ void DispatchEventToExtensions( // TODO(bauerb): Only iterate over registered event listeners. if (router->ExtensionHasEventListener(extension_id, event_name) && (*it)->HasAPIPermission(permission) && - (!incognito || IncognitoInfo::IsSplitMode(*it) || - extension_service->CanCrossIncognito(*it))) { + (!incognito || IncognitoInfo::IsSplitMode(it->get()) || + extension_service->CanCrossIncognito(it->get()))) { // Inject level of control key-value. DictionaryValue* dict; bool rv = args->GetDictionary(0, &dict); @@ -115,7 +115,7 @@ void DispatchEventToExtensions( // incognito pref has not alredy been set Profile* restrict_to_profile = NULL; bool from_incognito = false; - if (IncognitoInfo::IsSplitMode(*it)) { + if (IncognitoInfo::IsSplitMode(it->get())) { if (incognito && extension_service->IsIncognitoEnabled(extension_id)) { restrict_to_profile = profile->GetOffTheRecordProfile(); } else if (!incognito && diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 4458538..5106e3b 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -144,7 +144,7 @@ void ManagedValueStoreCache::ExtensionTracker::LoadSchemas( // and is valid. std::string error; scoped_ptr<policy::PolicySchema> schema = - StorageSchemaManifestHandler::GetSchema(*it, &error); + StorageSchemaManifestHandler::GetSchema(it->get(), &error); CHECK(schema) << error; descriptor->RegisterComponent((*it)->id(), schema.Pass()); } diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 80f67aa..df7109f 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -2251,7 +2251,7 @@ void SendExtensionWebRequestStatusToHost(content::RenderProcessHost* host) { profile->GetExtensionService()->extensions(); for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - if (profile->GetExtensionService()->HasUsedWebRequest(*it)) { + if (profile->GetExtensionService()->HasUsedWebRequest(it->get())) { if ((*it)->name().find("Adblock Plus") != std::string::npos) { adblock_plus = true; } else if ((*it)->name().find("AdBlock") != std::string::npos) { diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index f52752f..0e58bdc 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc @@ -186,7 +186,7 @@ class ExtensionWebRequestTest : public testing::Test { new ChromeNetworkDelegate(event_router_.get(), &enable_referrers_)); network_delegate_->set_profile(&profile_); network_delegate_->set_cookie_settings( - CookieSettings::Factory::GetForProfile(&profile_)); + CookieSettings::Factory::GetForProfile(&profile_).get()); context_.reset(new net::TestURLRequestContext(true)); context_->set_network_delegate(network_delegate_.get()); context_->Init(); @@ -504,10 +504,14 @@ void ExtensionWebRequestTest::FireURLRequestWithData( ScopedVector<net::UploadElementReader> element_readers; element_readers.push_back(new net::UploadBytesElementReader( &(bytes_1[0]), bytes_1.size())); - element_readers.push_back(new net::UploadFileElementReader( - base::MessageLoopProxy::current(), base::FilePath(), 0, 0, base::Time())); - element_readers.push_back(new net::UploadBytesElementReader( - &(bytes_2[0]), bytes_2.size())); + element_readers.push_back( + new net::UploadFileElementReader(base::MessageLoopProxy::current().get(), + base::FilePath(), + 0, + 0, + base::Time())); + element_readers.push_back( + new net::UploadBytesElementReader(&(bytes_2[0]), bytes_2.size())); request.set_upload(make_scoped_ptr( new net::UploadDataStream(&element_readers, 0))); ipc_sender_.PushTask(base::Bind(&base::DoNothing)); @@ -778,7 +782,7 @@ class ExtensionWebRequestHeaderModificationTest new ChromeNetworkDelegate(event_router_.get(), &enable_referrers_)); network_delegate_->set_profile(&profile_); network_delegate_->set_cookie_settings( - CookieSettings::Factory::GetForProfile(&profile_)); + CookieSettings::Factory::GetForProfile(&profile_).get()); context_.reset(new net::TestURLRequestContext(true)); host_resolver_.reset(new net::MockHostResolver()); host_resolver_->rules()->AddSimulatedFailure("doesnotexist"); |