Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

chrome/browser/profiles/off_the_record_profile_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/run_loop.h"
 #include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_io_thread_state.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/common/page_zoom.h"
 #include "net/dns/mock_host_resolver.h"
 
 using content::HostZoomMap;
 
 namespace {
 
 class TestingProfileWithHostZoomMap : public TestingProfile {
  public:
   TestingProfileWithHostZoomMap() {
-    zoom_subscription_ =
-        HostZoomMap::GetDefaultForBrowserContext(this)
-            ->AddZoomLevelChangedCallback(
-                base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged,
-                           base::Unretained(this)));
+    HostZoomMap* host_zoom_map = HostZoomMap::GetDefaultForBrowserContext(this);
+    zoom_subscription_ = host_zoom_map->AddZoomLevelChangedCallback(
+        base::Bind(&TestingProfileWithHostZoomMap::OnZoomLevelChanged,
+                   base::Unretained(this)));
+    zoom_level_prefs_.reset(
+        new chrome::ChromeZoomLevelPrefs(GetPrefs(), GetPath()));
+    zoom_level_prefs_->InitPrefsAndCopyToHostZoomMap(GetPath(), host_zoom_map);
   }
 
   virtual ~TestingProfileWithHostZoomMap() {}
 
   // Profile overrides:
   virtual PrefService* GetOffTheRecordPrefs() override {
     return GetPrefs();
   }
 
  private:
   void OnZoomLevelChanged(const HostZoomMap::ZoomLevelChange& change) {
 
     if (change.mode != HostZoomMap::ZOOM_CHANGED_FOR_HOST)
       return;
 
     HostZoomMap* host_zoom_map = HostZoomMap::GetDefaultForBrowserContext(this);
 
     double level = change.zoom_level;
-    DictionaryPrefUpdate update(prefs_.get(), prefs::kPerHostZoomLevels);
+    std::string per_host_zoom_levels(prefs::kPartitionPerHostZoomLevels);
+    per_host_zoom_levels.append(".0");
+    DictionaryPrefUpdate update(GetPrefs(),
+                                prefs::kPartitionPerHostZoomLevels);
     base::DictionaryValue* host_zoom_dictionary = update.Get();
     if (content::ZoomValuesEqual(level, host_zoom_map->GetDefaultZoomLevel())) {
       host_zoom_dictionary->RemoveWithoutPathExpansion(change.host, NULL);
     } else {
       host_zoom_dictionary->SetWithoutPathExpansion(
           change.host, new base::FundamentalValue(level));
     }
   }
 
   scoped_ptr<HostZoomMap::Subscription> zoom_subscription_;
+  scoped_ptr<chrome::ChromeZoomLevelPrefs> zoom_level_prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingProfileWithHostZoomMap);
 };
 
 }  // namespace
 
 // We need to have a BrowserProcess in g_browser_process variable, since
 // OffTheRecordProfileImpl ctor uses it in
 // ProfileIOData::InitializeProfileParams.
 class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
@@ skipping 101 matching lines @@
   parent_zoom_map->SetZoomLevelForHost(host, zoom_level_40);
   ASSERT_EQ(
       parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
       zoom_level_40);
 
   EXPECT_EQ(parent_zoom_map->GetZoomLevelForHostAndScheme("http", host),
             child_zoom_map->GetZoomLevelForHostAndScheme("http", host)) <<
                 "Parent change should propagate to child.";
   base::RunLoop().RunUntilIdle();
 }