diff options
Diffstat (limited to 'chrome/browser')
14 files changed, 28 insertions, 28 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index f6c95e4..c00b8ff 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -2205,7 +2205,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( additional_providers->push_back(new MediaFileSystemMountPointProvider( storage_partition_path, pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken( - MediaFileSystemMountPointProvider::kMediaTaskRunnerName)))); + MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get())); #endif } diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc index cea58e6..0e5c553 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_unittest.cc @@ -91,10 +91,9 @@ class MediaFileValidatorTest : public InProcessBrowserTest { ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; additional_providers.push_back(new fileapi::TestMountPointProvider( - base::MessageLoopProxy::current(), src_path)); - additional_providers.push_back( - new MediaFileSystemMountPointProvider( - base, base::MessageLoopProxy::current())); + base::MessageLoopProxy::current().get(), src_path)); + additional_providers.push_back(new MediaFileSystemMountPointProvider( + base, base::MessageLoopProxy::current().get())); file_system_context_ = fileapi::CreateFileSystemContextWithAdditionalProvidersForTesting( NULL, additional_providers.Pass(), base); diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index d876be3..3e8f6f1 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc @@ -128,7 +128,7 @@ class NativeMediaFileUtilTest : public testing::Test { ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers; additional_providers.push_back(new MediaFileSystemMountPointProvider( - data_dir_.path(), base::MessageLoopProxy::current())); + data_dir_.path(), base::MessageLoopProxy::current().get())); file_system_context_ = new fileapi::FileSystemContext( fileapi::FileSystemTaskRunners::CreateMockTaskRunners(), diff --git a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc index acb3f72..e794f61 100644 --- a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util_unittest.cc @@ -146,13 +146,12 @@ class TestPicasaFileUtil : public PicasaFileUtil { class TestMediaFileSystemMountPointProvider : public chrome::MediaFileSystemMountPointProvider { public: - TestMediaFileSystemMountPointProvider( - const base::FilePath& profile_path, - PicasaFileUtil* picasa_file_util) + TestMediaFileSystemMountPointProvider(const base::FilePath& profile_path, + PicasaFileUtil* picasa_file_util) : chrome::MediaFileSystemMountPointProvider( - profile_path, base::MessageLoopProxy::current()), - test_file_util_(picasa_file_util) { - } + profile_path, + base::MessageLoopProxy::current().get()), + test_file_util_(picasa_file_util) {} virtual fileapi::AsyncFileUtil* GetAsyncFileUtil(fileapi::FileSystemType type) OVERRIDE { diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 43755d0..71c5b2d 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -223,9 +223,8 @@ class ExperimentURLRequestContext : public net::URLRequestContext { // construction needs ot happen on the UI thread. return net::ERR_NOT_IMPLEMENTED; #else - config_service->reset( - net::ProxyService::CreateSystemProxyConfigService( - base::ThreadTaskRunnerHandle::Get(), NULL)); + config_service->reset(net::ProxyService::CreateSystemProxyConfigService( + base::ThreadTaskRunnerHandle::Get().get(), NULL)); return net::OK; #endif } diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc index 3b98e4b..f9dfe8c 100644 --- a/chrome/browser/printing/print_job_unittest.cc +++ b/chrome/browser/printing/print_job_unittest.cc @@ -104,7 +104,7 @@ TEST_F(PrintJobTest, SimplePrint) { EXPECT_EQ(base::MessageLoop::current(), job->message_loop()); scoped_refptr<TestOwner> owner(new TestOwner); TestSource source; - job->Initialize(owner, &source, 1); + job->Initialize(owner.get(), &source, 1); job->Stop(); EXPECT_FALSE(job->is_stopped()); EXPECT_TRUE(job->is_stopping()); diff --git a/chrome/browser/sync/glue/autofill_data_type_controller.cc b/chrome/browser/sync/glue/autofill_data_type_controller.cc index a9d666a..6703779 100644 --- a/chrome/browser/sync/glue/autofill_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_data_type_controller.cc @@ -59,7 +59,7 @@ bool AutofillDataTypeController::StartModels() { DCHECK_EQ(MODEL_STARTING, state()); autofill::AutofillWebDataService* web_data_service = - autofill::AutofillWebDataService::FromBrowserContext(profile()); + autofill::AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return false; diff --git a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc index a480737..a508a84 100644 --- a/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc +++ b/chrome/browser/sync/glue/autofill_profile_data_type_controller.cc @@ -51,7 +51,7 @@ void AutofillProfileDataTypeController::OnPersonalDataChanged() { personal_data_->RemoveObserver(this); autofill::AutofillWebDataService* web_data_service = - autofill::AutofillWebDataService::FromBrowserContext(profile()); + autofill::AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return; @@ -88,7 +88,7 @@ bool AutofillProfileDataTypeController::StartModels() { } autofill::AutofillWebDataService* web_data_service = - AutofillWebDataService::FromBrowserContext(profile()); + AutofillWebDataService::FromBrowserContext(profile()).get(); if (!web_data_service) return false; diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index e1eb6c1..81145034 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -61,7 +61,7 @@ AppStateMap GetAppStates(Profile* profile) { extension_service->GenerateInstalledExtensionsSet()); for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - if (extensions::sync_helper::IsSyncableApp(*it)) { + if (extensions::sync_helper::IsSyncableApp(it->get())) { const std::string& id = (*it)->id(); LoadApp(extension_service, id, &(app_state_map[id])); } diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index b976f56..dbf777d 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -80,7 +80,7 @@ void AppSearchProvider::RefreshApps() { apps_.clear(); for (ExtensionSet::const_iterator iter = extensions->begin(); iter != extensions->end(); ++iter) { - const extensions::Extension* app = *iter; + const extensions::Extension* app = iter->get(); if (!app->ShouldDisplayInAppLauncher()) continue; diff --git a/chrome/browser/ui/app_list/search/history.cc b/chrome/browser/ui/app_list/search/history.cc index eeb8b97..ec8fd00 100644 --- a/chrome/browser/ui/app_list/search/history.cc +++ b/chrome/browser/ui/app_list/search/history.cc @@ -34,7 +34,8 @@ History::History(content::BrowserContext* context) const base::FilePath data_file = browser_context_->GetPath().AppendASCII(kStoreDataFileName); store_ = new HistoryDataStore(data_file); - data_.reset(new HistoryData(store_, kMaxQueryEntries, kMaxSecondaryQueries)); + data_.reset( + new HistoryData(store_.get(), kMaxQueryEntries, kMaxSecondaryQueries)); data_->AddObserver(this); } diff --git a/chrome/browser/ui/app_list/search/history_data_store.cc b/chrome/browser/ui/app_list/search/history_data_store.cc index 0036b0e..b52598f 100644 --- a/chrome/browser/ui/app_list/search/history_data_store.cc +++ b/chrome/browser/ui/app_list/search/history_data_store.cc @@ -123,7 +123,8 @@ HistoryDataStore::HistoryDataStore(const base::FilePath& data_file) file_task_runner_ = pool->GetSequencedTaskRunnerWithShutdownBehavior( pool->GetNamedSequenceToken(token), base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); - writer_.reset(new base::ImportantFileWriter(data_file, file_task_runner_)); + writer_.reset( + new base::ImportantFileWriter(data_file, file_task_runner_.get())); cached_json_.reset(new base::DictionaryValue); cached_json_->SetString(kKeyVersion, kCurrentVersion); @@ -148,7 +149,7 @@ void HistoryDataStore::Flush(const OnFlushedCallback& on_flushed) { void HistoryDataStore::Load( const HistoryDataStore::OnLoadedCallback& on_loaded) { base::PostTaskAndReplyWithResult( - file_task_runner_, + file_task_runner_.get(), FROM_HERE, base::Bind(&HistoryDataStore::LoadOnBlockingPool, this), on_loaded); diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index dfb51cdf..1ebf284 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -78,7 +78,7 @@ bool HasSyncedExtensions(Profile* profile) { // The webstore is synced so that it stays put on the new tab // page, but since it's installed by default we don't want to // consider it when determining if the profile is dirty. - if (extensions::sync_helper::IsSyncable(*iter) && + if (extensions::sync_helper::IsSyncable(iter->get()) && (*iter)->id() != extension_misc::kWebStoreAppId) { VLOG(1) << "ProfileSigninConfirmationHelper: " << "profile contains a synced extension: " << (*iter)->id(); diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 627905b..d2530d0 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -225,7 +225,7 @@ void AddExceptionsGrantedByHostedApps( for (ExtensionSet::const_iterator extension = extensions->begin(); extension != extensions->end(); ++extension) { - if (!app_filter(**extension, profile)) + if (!app_filter(*extension->get(), profile)) continue; extensions::URLPatternSet web_extent = (*extension)->web_extent(); @@ -236,11 +236,12 @@ void AddExceptionsGrantedByHostedApps( AddExceptionForHostedApp(url_pattern, *extension->get(), exceptions); } // Retrieve the launch URL. - GURL launch_url = extensions::AppLaunchInfo::GetLaunchWebURL(*extension); + GURL launch_url = + extensions::AppLaunchInfo::GetLaunchWebURL(extension->get()); // Skip adding the launch URL if it is part of the web extent. if (web_extent.MatchesURL(launch_url)) continue; - AddExceptionForHostedApp(launch_url.spec(), **extension, exceptions); + AddExceptionForHostedApp(launch_url.spec(), *extension->get(), exceptions); } } |