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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

Issue 393133002: Migrate HostZoomMap to live in StoragePartition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test compilation. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_page_zoom.cc » ('j') | chrome/browser/profiles/profile.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browsing_data/browsing_data_remover.h" 5 #include "chrome/browser/browsing_data/browsing_data_remover.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 virtual content::DOMStorageContext* GetDOMStorageContext() OVERRIDE { 159 virtual content::DOMStorageContext* GetDOMStorageContext() OVERRIDE {
160 return NULL; 160 return NULL;
161 } 161 }
162 virtual content::IndexedDBContext* GetIndexedDBContext() OVERRIDE { 162 virtual content::IndexedDBContext* GetIndexedDBContext() OVERRIDE {
163 return NULL; 163 return NULL;
164 } 164 }
165 virtual content::ServiceWorkerContext* GetServiceWorkerContext() OVERRIDE { 165 virtual content::ServiceWorkerContext* GetServiceWorkerContext() OVERRIDE {
166 return NULL; 166 return NULL;
167 } 167 }
168 168
169 virtual content::HostZoomMap* GetHostZoomMap() OVERRIDE {
170 return NULL;
171 }
172
173 virtual PrefService* GetZoomLevelPrefs() OVERRIDE {
174 return NULL;
175 }
176
169 virtual void ClearDataForOrigin(uint32 remove_mask, 177 virtual void ClearDataForOrigin(uint32 remove_mask,
170 uint32 quota_storage_remove_mask, 178 uint32 quota_storage_remove_mask,
171 const GURL& storage_origin, 179 const GURL& storage_origin,
172 net::URLRequestContextGetter* rq_context, 180 net::URLRequestContextGetter* rq_context,
173 const base::Closure& callback) OVERRIDE { 181 const base::Closure& callback) OVERRIDE {
174 BrowserThread::PostTask(BrowserThread::UI, 182 BrowserThread::PostTask(BrowserThread::UI,
175 FROM_HERE, 183 FROM_HERE,
176 base::Bind(&TestStoragePartition::AsyncRunCallback, 184 base::Bind(&TestStoragePartition::AsyncRunCallback,
177 base::Unretained(this), 185 base::Unretained(this),
178 callback)); 186 callback));
179 } 187 }
awong 2014/08/20 19:56:58 nit: why delete this line?
wjmaclean 2014/08/20 20:15:45 Not intentional. Fixed.
180
181 virtual void ClearData(uint32 remove_mask, 188 virtual void ClearData(uint32 remove_mask,
182 uint32 quota_storage_remove_mask, 189 uint32 quota_storage_remove_mask,
183 const GURL& storage_origin, 190 const GURL& storage_origin,
184 const OriginMatcherFunction& origin_matcher, 191 const OriginMatcherFunction& origin_matcher,
185 const base::Time begin, 192 const base::Time begin,
186 const base::Time end, 193 const base::Time end,
187 const base::Closure& callback) OVERRIDE { 194 const base::Closure& callback) OVERRIDE {
188 // Store stuff to verify parameters' correctness later. 195 // Store stuff to verify parameters' correctness later.
189 storage_partition_removal_data_.remove_mask = remove_mask; 196 storage_partition_removal_data_.remove_mask = remove_mask;
190 storage_partition_removal_data_.quota_storage_remove_mask = 197 storage_partition_removal_data_.quota_storage_remove_mask =
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
1832 EXPECT_EQ(1u, tester.clear_count()); 1839 EXPECT_EQ(1u, tester.clear_count());
1833 EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode()); 1840 EXPECT_EQ(CLEAR_CONTEXTS, tester.last_clear_mode());
1834 } 1841 }
1835 1842
1836 TEST_F(BrowsingDataRemoverTest, DomainReliability_NoMonitor) { 1843 TEST_F(BrowsingDataRemoverTest, DomainReliability_NoMonitor) {
1837 BlockUntilBrowsingDataRemoved( 1844 BlockUntilBrowsingDataRemoved(
1838 BrowsingDataRemover::EVERYTHING, 1845 BrowsingDataRemover::EVERYTHING,
1839 BrowsingDataRemover::REMOVE_HISTORY | 1846 BrowsingDataRemover::REMOVE_HISTORY |
1840 BrowsingDataRemover::REMOVE_COOKIES, false); 1847 BrowsingDataRemover::REMOVE_COOKIES, false);
1841 } 1848 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_page_zoom.cc » ('j') | chrome/browser/profiles/profile.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698