diff options
Diffstat (limited to 'chrome/browser/browsing_data')
6 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc index de2017c..13c065d 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc @@ -23,8 +23,8 @@ using content::BrowserContext; // static BrowsingDataQuotaHelper* BrowsingDataQuotaHelper::Create(Profile* profile) { return new BrowsingDataQuotaHelperImpl( - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), BrowserContext::GetDefaultStoragePartition(profile)->GetQuotaManager()); } diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc index 0c9827d..ce0b511 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc @@ -35,13 +35,14 @@ class BrowsingDataQuotaHelperTest : public testing::Test { virtual void SetUp() OVERRIDE { EXPECT_TRUE(dir_.CreateUniqueTempDir()); quota_manager_ = new quota::QuotaManager( - false, dir_.path(), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB), + false, + dir_.path(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(), NULL); helper_ = new BrowsingDataQuotaHelperImpl( - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), quota_manager_.get()); } diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index 3e880f7..1b74264 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -454,7 +454,7 @@ void BrowsingDataRemover::RemoveImpl(int remove_mask, if (remove_mask & REMOVE_PASSWORDS) { content::RecordAction(UserMetricsAction("ClearBrowsingData_Passwords")); PasswordStore* password_store = PasswordStoreFactory::GetForProfile( - profile_, Profile::EXPLICIT_ACCESS); + profile_, Profile::EXPLICIT_ACCESS).get(); if (password_store) password_store->RemoveLoginsCreatedBetween(delete_begin_, delete_end_); @@ -689,7 +689,7 @@ void BrowsingDataRemover::ClearLoggedInPredictor() { return; predictors::LoggedInPredictorTable* logged_in_table = - predictor_db->logged_in_table(); + predictor_db->logged_in_table().get(); if (!logged_in_table) return; diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 314fd0b..24b6f3a 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -627,8 +627,8 @@ class BrowsingDataRemoverTest : public testing::Test, quota_manager_ = new quota::MockQuotaManager( profile_->IsOffTheRecord(), profile_->GetPath(), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), - BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get(), + BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB).get(), profile_->GetExtensionSpecialStoragePolicy()); } return quota_manager_.get(); diff --git a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc index 825b99f..07fd27b 100644 --- a/chrome/browser/browsing_data/cookies_tree_model_unittest.cc +++ b/chrome/browser/browsing_data/cookies_tree_model_unittest.cc @@ -1111,7 +1111,7 @@ TEST_F(CookiesTreeModelTest, ContentSettings) { HostContentSettingsMap* content_settings = profile.GetHostContentSettingsMap(); CookieSettings* cookie_settings = - CookieSettings::Factory::GetForProfile(&profile); + CookieSettings::Factory::GetForProfile(&profile).get(); MockSettingsObserver observer; CookieTreeRootNode* root = diff --git a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc index 5d7f014..d026f5e 100644 --- a/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc +++ b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc @@ -10,7 +10,7 @@ using content::BrowserThread; MockBrowsingDataQuotaHelper::MockBrowsingDataQuotaHelper(Profile* profile) : BrowsingDataQuotaHelper(BrowserThread::GetMessageLoopProxyForThread( - BrowserThread::IO)) {} + BrowserThread::IO).get()) {} MockBrowsingDataQuotaHelper::~MockBrowsingDataQuotaHelper() {} |