Move creation and ownership of HostZoomMap to content instead of having every embedder do this.

chrome/browser/profiles/off_the_record_profile_impl.cc

 // Copyright (c) 2012 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/profiles/off_the_record_profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
@@ skipping 65 matching lines @@
       original_profile, otr_profile);
 }
 
 }  // namespace
 
 OffTheRecordProfileImpl::OffTheRecordProfileImpl(Profile* real_profile)
     : profile_(real_profile),
       prefs_(real_profile->GetOffTheRecordPrefs()),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       start_time_(Time::Now()) {
+  // Create new host zoom map and copy zoom levels from parent.
+  HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
+  HostZoomMap* parent_host_zoom_map =
+      HostZoomMap::GetForBrowserContext(profile_);
+  host_zoom_map->CopyFrom(parent_host_zoom_map);
+  // Observe parent's HZM change for propagating change of parent's
+  // change to this HZM.
+  registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
+                 content::Source<HostZoomMap>(parent_host_zoom_map));
 }
 
 void OffTheRecordProfileImpl::Init() {
   extension_process_manager_.reset(ExtensionProcessManager::Create(this));
 
   BrowserList::AddObserver(this);
 
   ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);
 
   DCHECK_NE(IncognitoModePrefs::DISABLED,
@@ skipping 242 matching lines @@
   // 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(
         GetPrefs(), GetExtensionService(), true);
   }
   return host_content_settings_map_.get();
 }
 
-HostZoomMap* OffTheRecordProfileImpl::GetHostZoomMap() {
-  // Create new host zoom map and copy zoom levels from parent.
-  if (!host_zoom_map_) {
-    host_zoom_map_ = HostZoomMap::Create();
-    host_zoom_map_->CopyFrom(profile_->GetHostZoomMap());
-    // Observe parent's HZM change for propagating change of parent's
-    // change to this HZM.
-    registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-                   content::Source<HostZoomMap>(profile_->GetHostZoomMap()));
-  }
-  return host_zoom_map_.get();
-}
-
 content::GeolocationPermissionContext*
     OffTheRecordProfileImpl::GetGeolocationPermissionContext() {
   return profile_->GetGeolocationPermissionContext();
 }
 
 content::SpeechInputPreferences*
     OffTheRecordProfileImpl::GetSpeechInputPreferences() {
   return profile_->GetSpeechInputPreferences();
 }
 
@@ skipping 124 matching lines @@
 void OffTheRecordProfileImpl::ClearNetworkingHistorySince(base::Time time) {
   // No need to do anything here, our transport security state is read-only.
 }
 
 GURL OffTheRecordProfileImpl::GetHomePage() {
   return profile_->GetHomePage();
 }
 
 void OffTheRecordProfileImpl::Observe(int type,
                      const content::NotificationSource& source,
                      const content::NotificationDetails& details) {

[Avi (use Gerrit), 2012/02/21 20:40:16]

fix indent here

[jam, 2012/02/21 20:41:20]

Done.

   if (type == content::NOTIFICATION_ZOOM_LEVEL_CHANGED) {
     const std::string& host =
         *(content::Details<const std::string>(details).ptr());
     if (!host.empty()) {
-      double level = profile_->GetHostZoomMap()->GetZoomLevel(host);
-      GetHostZoomMap()->SetZoomLevel(host, level);
+      HostZoomMap* host_zoom_map = HostZoomMap::GetForBrowserContext(this);
+      HostZoomMap* parent_host_zoom_map =
+          HostZoomMap::GetForBrowserContext(profile_);
+      double level = parent_host_zoom_map->GetZoomLevel(host);
+      host_zoom_map->SetZoomLevel(host, level);
     }
   }
 }
 
 #if defined(OS_CHROMEOS)
 // Special case of the OffTheRecordProfileImpl which is used while Guest
 // session in CrOS.
 class GuestSessionProfile : public OffTheRecordProfileImpl {
  public:
   explicit GuestSessionProfile(Profile* real_profile)
@@ skipping 15 matching lines @@
   OffTheRecordProfileImpl* profile = NULL;
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     profile = new GuestSessionProfile(this);
 #endif
   if (!profile)
     profile = new OffTheRecordProfileImpl(this);
   profile->Init();
   return profile;
 }