Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/zoom/chrome_zoom_level_prefs.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 "chrome/browser/ui/zoom/chrome_zoom_level_prefs.h"
 
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/prefs/json_pref_store.h"
@@ skipping 16 matching lines @@
   size_t int_key =
       BASE_HASH_NAMESPACE::hash<base::FilePath>()(relative_path);
   return base::SizeTToString(int_key);
 }
 
 }  // namespace
 
 namespace chrome {
 
 ChromeZoomLevelPrefs::ChromeZoomLevelPrefs(PrefService* pref_service,
-                                           const base::FilePath& profile_path)
+                                           const base::FilePath& profile_path,
+                                           const base::FilePath& partition_path)
     : pref_service_(pref_service),
-      profile_path_(profile_path),
       host_zoom_map_(nullptr) {
   DCHECK(pref_service_);
+
+  DCHECK(!partition_path.empty());
+  DCHECK((partition_path == profile_path) ||
+         profile_path.IsParent(partition_path));
+  // Create a partition_key string with no '.'s in it. For the default
+  // StoragePartition, this string will always be "0".
+  base::FilePath partition_relative_path;
+  profile_path.AppendRelativePath(partition_path, &partition_relative_path);
+  partition_key_ = GetHash(partition_relative_path);
+
 }
 
 ChromeZoomLevelPrefs::~ChromeZoomLevelPrefs() {
 }
 
-void ChromeZoomLevelPrefs::InitPrefsAndCopyToHostZoomMap(
-    const base::FilePath& partition_path,
+void ChromeZoomLevelPrefs::InitHostZoomMap(

[sky, 2014/11/11 20:21:56]

Make declaration/definition position match.

[wjmaclean, 2014/11/11 20:59:09]

Done.

     content::HostZoomMap* host_zoom_map) {
-  DCHECK(!partition_path.empty());
-  DCHECK((partition_path == profile_path_) ||
-         profile_path_.IsParent(partition_path));
   // This init function must be called only once.
   DCHECK(!host_zoom_map_);
   DCHECK(host_zoom_map);
   host_zoom_map_ = host_zoom_map;
 
-  // Create a partition_key string with no '.'s in it. For the default
-  // StoragePartition, this string will always be "0".
-  base::FilePath partition_relative_path;
-  profile_path_.AppendRelativePath(partition_path, &partition_relative_path);
-  partition_key_ = GetHash(partition_relative_path);
-
   // Initialize the default zoom level.
   host_zoom_map_->SetDefaultZoomLevel(GetDefaultZoomLevelPref());
 
   // Initialize the HostZoomMap with per-host zoom levels from the persisted
   // zoom-level preference values.
   const base::DictionaryValue* host_zoom_dictionaries =
       pref_service_->GetDictionary(prefs::kPartitionPerHostZoomLevels);
   const base::DictionaryValue* host_zoom_dictionary = nullptr;
   if (host_zoom_dictionaries->GetDictionary(partition_key_,
                                             &host_zoom_dictionary)) {
@@ skipping 116 matching lines @@
     base::DictionaryValue* host_zoom_dictionaries = update.Get();
     base::DictionaryValue* host_zoom_dictionary = nullptr;
     host_zoom_dictionaries->GetDictionary(partition_key_,
                                           &host_zoom_dictionary);
     for (const std::string& s : keys_to_remove)
       host_zoom_dictionary->RemoveWithoutPathExpansion(s, nullptr);
   }
 }
 
 }  // namespace chrome