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

Unified Diff: chrome/browser/profiles/off_the_record_profile_impl_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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index 4a568b746998b6e6b788ebf64b2ee2d1e7505e2a..c45ac4286d341d5e1c4401a711ce2a4fe10d77c2 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -28,9 +28,10 @@ class TestingProfileWithHostZoomMap : public TestingProfile {
public:
TestingProfileWithHostZoomMap() {
zoom_subscription_ =
- HostZoomMap::GetForBrowserContext(this)->AddZoomLevelChangedCallback(
- base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged,
- base::Unretained(this)));
+ HostZoomMap::GetDefaultForBrowserContext(this)
+ ->AddZoomLevelChangedCallback(
+ base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged,
+ base::Unretained(this)));
}
virtual ~TestingProfileWithHostZoomMap() {}
@@ -46,7 +47,7 @@ class TestingProfileWithHostZoomMap : public TestingProfile {
if (change.mode != HostZoomMap::ZOOM_CHANGED_FOR_HOST)
return;
- HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
+ HostZoomMap* host_zoom_map = HostZoomMap::GetDefaultForBrowserContext(this);
double level = change.zoom_level;
DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
@@ -131,7 +132,7 @@ TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
// Prepare parent host zoom map.
HostZoomMap* parent_zoom_map =
- HostZoomMap::GetForBrowserContext(parent_profile);
+ HostZoomMap::GetDefaultForBrowserContext(parent_profile);
ASSERT_TRUE(parent_zoom_map);
parent_zoom_map->SetZoomLevelForHost(host, zoom_level_25);
@@ -142,17 +143,13 @@ TEST_F(OffTheRecordProfileImplTest, GetHostZoomMap) {
// OnZoomLevelChanged.
// Prepare an off the record profile owned by the parent profile.
- parent_profile->SetOffTheRecordProfile(
- scoped_ptr<Profile>(new OffTheRecordProfileImpl(parent_profile)));
OffTheRecordProfileImpl* child_profile =
static_cast<OffTheRecordProfileImpl*>(
parent_profile->GetOffTheRecordProfile());
- child_profile->InitIoData();
- child_profile->InitHostZoomMap();
// Prepare child host zoom map.
HostZoomMap* child_zoom_map =
- HostZoomMap::GetForBrowserContext(child_profile);
+ HostZoomMap::GetDefaultForBrowserContext(child_profile);
ASSERT_TRUE(child_zoom_map);
// Verify.

Powered by Google App Engine
This is Rietveld 408576698