Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/zoom/chrome_zoom_level_prefs.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
 #define CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_store.h"
 #include "content/public/browser/host_zoom_map.h"
+#include "content/public/browser/zoom_level_delegate.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chrome {
 
 // A class to manage per-partition default and per-host zoom levels in Chrome's
 // preference system. It implements an interface between the content/ zoom
 // levels in HostZoomMap and Chrome's preference system. All changes
 // to the per-partition default zoom levels from chrome/ flow through this
 // class. Any changes to per-host levels are updated when HostZoomMap calls
 // OnZoomLevelChanged.
-class ChromeZoomLevelPrefs {
+class ChromeZoomLevelPrefs : public content::ZoomLevelDelegate {
  public:
   typedef base::CallbackList<void(void)>::Subscription
       DefaultZoomLevelSubscription;
 
   // Initialize the pref_service and the profile_path via the constructor,
   // as these concepts won't be available in the content base class
   // (to be added later) which will define the InitPrefsAndCopyToHostZoomMap
   // interface. |pref_service_| must outlive this class.
   ChromeZoomLevelPrefs(PrefService* pref_service,
                        const base::FilePath& profile_path);
   virtual ~ChromeZoomLevelPrefs();
 
   static std::string GetHashForTesting(const base::FilePath& relative_path);
 
-  virtual void InitPrefsAndCopyToHostZoomMap(
-      const base::FilePath& partition_path,
-      content::HostZoomMap* host_zoom_map);
-
   void SetDefaultZoomLevelPref(double level);
   double GetDefaultZoomLevelPref() const;
   scoped_ptr<DefaultZoomLevelSubscription> RegisterDefaultZoomLevelCallback(
       const base::Closure& callback);
 
   void ExtractPerHostZoomLevels(
       const base::DictionaryValue* host_zoom_dictionary,
       bool sanitize_partition_host_zoom_levels);
 
+  // content::ZoomLevelDelegate
+  void InitPrefsAndCopyToHostZoomMap(

[Fady Samuel, 2014/11/03 22:11:11]

nit: Call something that doesn't mention Prefs in content?

[wjmaclean, 2014/11/04 19:34:25]

Done.

+      const base::FilePath& partition_path,
+      content::HostZoomMap* host_zoom_map) override;
+
  private:
   // This is a callback function that receives notifications from HostZoomMap
   // when per-host zoom levels change. It is used to update the per-host
   // zoom levels (if any) managed by this class (for its associated partition).
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
 
   PrefService* pref_service_;
   const base::FilePath profile_path_;
   content::HostZoomMap* host_zoom_map_;
   scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
   std::string partition_key_;
   base::CallbackList<void(void)> default_zoom_changed_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeZoomLevelPrefs);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_