Migrate HostZoomMap to live in StoragePartition.

chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 497 matching lines @@
   pref_change_registrar_.Add(
       prefs::kVideoCaptureAllowed,
       base::Bind(&ContentSettingsHandler::UpdateMediaSettingsView,
                  base::Unretained(this)));
   pref_change_registrar_.Add(
       prefs::kEnableDRM,
       base::Bind(
           &ContentSettingsHandler::UpdateProtectedContentExceptionsButton,
           base::Unretained(this)));
 
-  content::HostZoomMap* host_zoom_map =
-      content::HostZoomMap::GetForBrowserContext(context);
+  // Here we only subscribe to the HostZoomMap for the default storage partition
+  // since we don't allow the user to manage the zoom levels for apps.
+  // We're only interested in zoom-levels that are persisted, since the user
+  // is given the opportunity to view/delete these in the content-settings page.
   host_zoom_map_subscription_ =
-      host_zoom_map->AddZoomLevelChangedCallback(
-          base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
-                     base::Unretained(this)));
+      content::HostZoomMap::GetDefaultForBrowserContext(context)
+          ->AddZoomLevelChangedCallback(
+              base::Bind(&ContentSettingsHandler::OnZoomLevelChanged,
+                         base::Unretained(this)));

[Fady Samuel, 2014/08/14 18:56:26]

Is there a lifetime issue here?

[wjmaclean, 2014/08/14 19:12:20]

I don't think so. Assuming the previous code was correct, there is no
fundamental lifetime change for the HostZoomMap: it used to be directly a
UserData element associated with the profile, now its contained inside a data
structure chain whose lifetime is still controlled by the 
StoragePartitionImplMap being UserData of the profile.

 
   flash_settings_manager_.reset(new PepperFlashSettingsManager(this, context));
 }
 
 void ContentSettingsHandler::InitializePage() {
   media_settings_ = MediaSettingsInfo();
   RefreshFlashMediaSettings();
 
   UpdateHandlersEnabledRadios();
   UpdateAllExceptionsViewsFromModel();
@@ skipping 458 matching lines @@
 
   UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
   UpdateExceptionsViewFromHostContentSettingsMap(
       CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
 }
 
 void ContentSettingsHandler::UpdateZoomLevelsExceptionsView() {
   base::ListValue zoom_levels_exceptions;
 
   content::HostZoomMap* host_zoom_map =
-      content::HostZoomMap::GetForBrowserContext(GetBrowserContext(web_ui()));
+      content::HostZoomMap::GetDefaultForBrowserContext(
+          GetBrowserContext(web_ui()));
   content::HostZoomMap::ZoomLevelVector zoom_levels(
       host_zoom_map->GetAllZoomLevels());
   std::sort(zoom_levels.begin(), zoom_levels.end(), HostZoomSort);
 
   for (content::HostZoomMap::ZoomLevelVector::const_iterator i =
            zoom_levels.begin();
        i != zoom_levels.end();
        ++i) {
     scoped_ptr<base::DictionaryValue> exception(new base::DictionaryValue);
     switch (i->mode) {
@@ skipping 232 matching lines @@
     const base::ListValue* args) {
   std::string mode;
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
 
   std::string pattern;
   rv = args->GetString(2, &pattern);
   DCHECK(rv);
 
   content::HostZoomMap* host_zoom_map =
-      content::HostZoomMap::GetForBrowserContext(GetBrowserContext(web_ui()));
+      content::HostZoomMap::GetDefaultForBrowserContext(
+          GetBrowserContext(web_ui()));
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   host_zoom_map->SetZoomLevelForHost(pattern, default_level);
 }
 
 void ContentSettingsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("setContentFilter",
       base::Bind(&ContentSettingsHandler::SetContentFilter,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("removeException",
       base::Bind(&ContentSettingsHandler::RemoveException,
@@ skipping 308 matching lines @@
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   // Exceptions apply only when the feature is enabled.
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunction(
       "ContentSettings.enableProtectedContentExceptions",
       base::FundamentalValue(enable_exceptions));
 }
 
 }  // namespace options