Merge 47568 - Forget zoom levels set/changed in incognito mode when exiting i...

chrome/browser/profile.cc

Index: chrome/browser/profile.cc
===================================================================
--- chrome/browser/profile.cc	(revision 47569)
+++ chrome/browser/profile.cc	(working copy)
@@ -440,7 +440,9 @@
   }
 
   virtual HostZoomMap* GetHostZoomMap() {
-    return profile_->GetHostZoomMap();
+    if (!host_zoom_map_)
+      host_zoom_map_ = new HostZoomMap(this);
+    return host_zoom_map_.get();
   }
 
   virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
@@ -584,6 +586,9 @@
   // We use a non-writable content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
+  // Use a separate zoom map for OTR.
+  scoped_refptr<HostZoomMap> host_zoom_map_;
+
   // Use a special WebKit context for OTR browsing.
   scoped_refptr<WebKitContext> webkit_context_;