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

chrome/browser/profile.cc

 // Copyright (c) 2010 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/profile.h"
 
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 422 matching lines @@
   virtual HostContentSettingsMap* GetHostContentSettingsMap() {
     // Retrieve the host content settings map of the parent profile in order to
     // ensure the preferences have been migrated.
     profile_->GetHostContentSettingsMap();
     if (!host_content_settings_map_.get())
       host_content_settings_map_ = new HostContentSettingsMap(this);
     return host_content_settings_map_.get();
   }
 
   virtual HostZoomMap* GetHostZoomMap() {
-    return profile_->GetHostZoomMap();
+    if (!host_zoom_map_)
+      host_zoom_map_ = new HostZoomMap(this);
+    return host_zoom_map_.get();
   }
 
   virtual GeolocationContentSettingsMap* GetGeolocationContentSettingsMap() {
     return profile_->GetGeolocationContentSettingsMap();
   }
 
   virtual Blacklist* GetPrivacyBlacklist() {
     return profile_->GetPrivacyBlacklist();
   }
 
@@ skipping 123 matching lines @@
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
   // Use a separate desktop notification service for OTR.
   scoped_ptr<DesktopNotificationService> desktop_notification_service_;
 
   // 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_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
   // profile because then the main profile would learn some of the host names
   // the user visited while OTR.
   scoped_ptr<SSLHostState> ssl_host_state_;
 
   // Use a separate FindBarState so search terms do not leak back to the main
   // profile.
@@ skipping 847 matching lines @@
 }
 
 void ProfileImpl::InitSyncService() {
   profile_sync_factory_.reset(
       new ProfileSyncFactoryImpl(this,
                                  CommandLine::ForCurrentProcess()));
   sync_service_.reset(
       profile_sync_factory_->CreateProfileSyncService());
   sync_service_->Initialize();
 }