Migrate HostZoomMap to live in StoragePartition.

chrome/browser/profiles/off_the_record_profile_impl.h

Index: chrome/browser/profiles/off_the_record_profile_impl.h
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.h b/chrome/browser/profiles/off_the_record_profile_impl.h
index 53e0621e2864432bf8407dc3eabb60a203b0539c..a90fc9a98a7713f7a046422589a3d62b758cc62c 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl.h
+++ b/chrome/browser/profiles/off_the_record_profile_impl.h
@@ -103,16 +103,18 @@ class OffTheRecordProfileImpl : public Profile {
   content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(OffTheRecordProfileImplTest, GetHostZoomMap);
   void InitIoData();
-  void InitHostZoomMap();
+  // Allows a profile to track changes in zoom levels in its parent profile.
+  void TrackZoomLevelsFromParent();
 
 #if defined(OS_ANDROID) || defined(OS_IOS)
   void UseSystemProxy();
 #endif  // defined(OS_ANDROID) || defined(OS_IOS)
 
-  void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
   PrefProxyConfigTracker* CreateProxyConfigTracker();
+  // Callback function for tracking parent's zoom level changes.
+  void TrackParentZoomLevelChanged(

[Charlie Reis, 2014/11/04 23:43:16]

The original OnZoomLevelChanged name sounds better to me, or maybe
OnParentZoomLevelChanged.  "Track" is a present-tense verb instructing this
class to start tracking change, not an action to take when the change has
occurred.

[wjmaclean, 2014/11/05 21:55:42]

Done.

I chose OnParentZoomLevelChanged ... I wanted something to clearly indicate that
we're monitor parent profile zoom, and not our own.

+      const content::HostZoomMap::ZoomLevelChange& change);
 
   // The real underlying profile.
   Profile* profile_;
@@ -120,6 +122,7 @@ class OffTheRecordProfileImpl : public Profile {
   // Weak pointer owned by |profile_|.
   PrefServiceSyncable* prefs_;
 
+  scoped_ptr<content::HostZoomMap::Subscription> track_zoom_subscription_;
   scoped_ptr<OffTheRecordProfileIOData::Handle> io_data_;
 
   // We use a non-persistent content settings map for OTR.
@@ -132,8 +135,6 @@ class OffTheRecordProfileImpl : public Profile {
 
   scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
 
-  scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
-
   DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImpl);
 };