Migrate HostZoomMap to live in StoragePartition.

chrome/browser/profiles/host_zoom_map_browsertest.cc

 // Copyright 2014 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 "content/public/browser/host_zoom_map.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_utils.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "url/gurl.h"
 
 namespace {
 
 class ZoomLevelChangeObserver {
  public:
   explicit ZoomLevelChangeObserver(Profile* profile)
       : message_loop_runner_(new content::MessageLoopRunner) {
     content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>(
-        content::HostZoomMap::GetForBrowserContext(profile));
+        content::HostZoomMap::GetDefaultForBrowserContext(profile));
     subscription_ = host_zoom_map->AddZoomLevelChangedCallback(base::Bind(
         &ZoomLevelChangeObserver::OnZoomLevelChanged, base::Unretained(this)));
   }
 
   void BlockUntilZoomLevelForHostHasChanged(const std::string& host) {
     while (!std::count(changed_hosts_.begin(), changed_hosts_.end(), host)) {
       message_loop_runner_->Run();
       message_loop_runner_ = new content::MessageLoopRunner;
     }
     changed_hosts_.clear();
@@ skipping 19 matching lines @@
   HostZoomMapBrowserTest() {}
 
  protected:
   void SetDefaultZoomLevel(double level) {
     browser()->profile()->GetPrefs()->SetDouble(
         prefs::kDefaultZoomLevel, level);
   }
 
   double GetZoomLevel(const GURL& url) {
     content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>(
-        content::HostZoomMap::GetForBrowserContext(browser()->profile()));
+        content::HostZoomMap::GetDefaultForBrowserContext(
+            browser()->profile()));
     return host_zoom_map->GetZoomLevelForHostAndScheme(url.scheme(),
                                                        url.host());
   }
 
   std::vector<std::string> GetHostsWithZoomLevels() {
     typedef content::HostZoomMap::ZoomLevelVector ZoomLevelVector;
     content::HostZoomMap* host_zoom_map = static_cast<content::HostZoomMap*>(
-        content::HostZoomMap::GetForBrowserContext(browser()->profile()));
+        content::HostZoomMap::GetDefaultForBrowserContext(
+            browser()->profile()));
     content::HostZoomMap::ZoomLevelVector zoom_levels =
         host_zoom_map->GetAllZoomLevels();
     std::vector<std::string> results;
     for (ZoomLevelVector::const_iterator it = zoom_levels.begin();
          it != zoom_levels.end(); ++it)
       results.push_back(it->host);
     return results;
   }
 
   std::vector<std::string> GetHostsWithZoomLevelsFromPrefs() {
-    PrefService* prefs = browser()->profile()->GetPrefs();
+    PrefService* prefs = content::BrowserContext::GetDefaultStoragePartition(
+                             browser()->profile())->GetZoomLevelPrefs();
     const base::DictionaryValue* values =
         prefs->GetDictionary(prefs::kPerHostZoomLevels);
     std::vector<std::string> results;
     if (values) {
       for (base::DictionaryValue::Iterator it(*values);
            !it.IsAtEnd(); it.Advance())
         results.push_back(it.key());
     }
     return results;
   }
@@ skipping 25 matching lines @@
  public:
   HostZoomMapSanitizationBrowserTest() {}
 
  private:
   // InProcessBrowserTest:
   virtual bool SetUpUserDataDirectory() OVERRIDE {
     // Zoom-related preferences demonstrating the two problems that could be
     // caused by the bug. They incorrectly contain a per-host zoom level for the
     // empty host; and a value for 'host1' that only differs from the default by
     // epsilon. Neither should have been persisted.
+    const char kPrefs[] =
+        "{'profile': {"
+        "   'default_zoom_level': 1.2"
+        "}}";
     const char kBrokenPrefs[] =
         "{'profile': {"
-        "   'default_zoom_level': 1.2,"
         "   'per_host_zoom_levels': {'': 1.1, 'host1': 1.20001, 'host2': 1.3}"
         "}}";
+    std::string prefs(kPrefs);
+    std::replace(prefs.begin(), prefs.end(), '\'', '\"');
     std::string broken_prefs(kBrokenPrefs);
     std::replace(broken_prefs.begin(), broken_prefs.end(), '\'', '\"');
 
-    base::FilePath user_data_directory, path_to_prefs;
+    base::FilePath user_data_directory, path_to_prefs, path_to_broken_prefs;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
     path_to_prefs = user_data_directory
         .AppendASCII(TestingProfile::kTestUserProfileDir)
         .Append(chrome::kPreferencesFilename);
+    path_to_broken_prefs = user_data_directory
+        .AppendASCII(TestingProfile::kTestUserProfileDir)
+        .Append(chrome::kZoomLevelPreferencesFilename);
     base::CreateDirectory(path_to_prefs.DirName());
-    base::WriteFile(path_to_prefs, broken_prefs.c_str(), broken_prefs.size());
+    base::WriteFile(path_to_prefs, prefs.c_str(), prefs.size());
+    base::WriteFile(
+        path_to_broken_prefs, broken_prefs.c_str(), broken_prefs.size());
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(HostZoomMapSanitizationBrowserTest);
 };
 
 // Regression test for crbug.com/364399.
 IN_PROC_BROWSER_TEST_F(HostZoomMapBrowserTest, ToggleDefaultZoomLevel) {
   const double default_zoom_level = content::ZoomFactorToZoomLevel(1.5);
 
@@ skipping 33 matching lines @@
   // any per-host values saved either to Pref, or internally in HostZoomMap.
   EXPECT_TRUE(GetHostsWithZoomLevels().empty());
   EXPECT_TRUE(GetHostsWithZoomLevelsFromPrefs().empty());
 }
 
 // Test that garbage data from crbug.com/364399 is cleared up on startup.
 IN_PROC_BROWSER_TEST_F(HostZoomMapSanitizationBrowserTest, ClearOnStartup) {
   EXPECT_THAT(GetHostsWithZoomLevels(), testing::ElementsAre("host2"));
   EXPECT_THAT(GetHostsWithZoomLevelsFromPrefs(), testing::ElementsAre("host2"));
 }