Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4949)

Unified Diff: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc
diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 7a301808ca3280ec63ca76c0bd1fd95f4dc84274..ca282ddc08516e29584060214c094c87ccbb8a09 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -238,7 +238,7 @@ class RemoveSafeBrowsingCookieTester : public RemoveCookieTester {
: browser_process_(TestingBrowserProcess::GetGlobal()) {
scoped_refptr<SafeBrowsingService> sb_service =
SafeBrowsingService::CreateSafeBrowsingService();
- browser_process_->SetSafeBrowsingService(sb_service);
+ browser_process_->SetSafeBrowsingService(sb_service.get());
sb_service->Initialize();
base::MessageLoop::current()->RunUntilIdle();
@@ -623,15 +623,15 @@ class BrowsingDataRemoverTest : public testing::Test,
}
quota::MockQuotaManager* GetMockManager() {
- if (!quota_manager_) {
+ if (!quota_manager_.get()) {
quota_manager_ = new quota::MockQuotaManager(
- profile_->IsOffTheRecord(),
- profile_->GetPath(),
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
- profile_->GetExtensionSpecialStoragePolicy());
+ profile_->IsOffTheRecord(),
+ profile_->GetPath(),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
+ profile_->GetExtensionSpecialStoragePolicy());
}
- return quota_manager_;
+ return quota_manager_.get();
}
// content::NotificationObserver implementation.
@@ -775,7 +775,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveUnprotectedLocalStorageForever) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
mock_policy->AddProtected(kOrigin1.GetOrigin());
- GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+ GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
RemoveLocalStorageTester tester(GetProfile());
@@ -801,7 +801,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveProtectedLocalStorageForever) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
mock_policy->AddProtected(kOrigin1.GetOrigin());
- GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+ GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
RemoveLocalStorageTester tester(GetProfile());
@@ -1178,7 +1178,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedUnprotectedOrigins) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
mock_policy->AddProtected(kOrigin1.GetOrigin());
- GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+ GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
PopulateTestQuotaManagedData(GetMockManager());
@@ -1212,7 +1212,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedSpecificOrigin) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
mock_policy->AddProtected(kOrigin1.GetOrigin());
- GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+ GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
PopulateTestQuotaManagedData(GetMockManager());
@@ -1247,7 +1247,7 @@ TEST_F(BrowsingDataRemoverTest, RemoveQuotaManagedProtectedOrigins) {
scoped_refptr<MockExtensionSpecialStoragePolicy> mock_policy =
new MockExtensionSpecialStoragePolicy;
mock_policy->AddProtected(kOrigin1.GetOrigin());
- GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy);
+ GetProfile()->SetExtensionSpecialStoragePolicy(mock_policy.get());
PopulateTestQuotaManagedData(GetMockManager());
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/browser/browsing_data/cookies_tree_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698