Fix crash in ChromeZoomLevelPrefs::ExtractPerHostZoomLevels().

chrome/browser/ui/zoom/chrome_zoom_level_prefs.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
 #define CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
@@ skipping 35 matching lines @@
   virtual void InitPrefsAndCopyToHostZoomMap(
       const base::FilePath& partition_path,
       content::HostZoomMap* host_zoom_map);
 
   void SetDefaultZoomLevelPref(double level);
   double GetDefaultZoomLevelPref() const;
   scoped_ptr<DefaultZoomLevelSubscription> RegisterDefaultZoomLevelCallback(
       const base::Closure& callback);
 
   void ExtractPerHostZoomLevels(
-      const base::DictionaryValue* host_zoom_dictionary);
+      const base::DictionaryValue* host_zoom_dictionary,
+      const char* dictionary_path);

[Bernhard Bauer, 2014/10/21 14:13:13]

An alternative would be to pass in a boolean that says whether to sanitize or
not. There are only two valid strings to pass in here anyway.

[wjmaclean, 2014/10/21 14:21:49]

I thought about using a bool, but then with the general feeling about enums
being preferred over bools for function parameters I thought this might be
simpler. In light of that, I'm still happy to switch to bools with comments at
the call site if you think that's ok (I'm not opposed to bools if we can use
comments).

[Bernhard Bauer, 2014/10/21 14:26:15]

Yeah, I'm absolutely okay with using well-commented bools.

 
  private:
   // This is a callback function that receives notifications from HostZoomMap
   // when per-host zoom levels change. It is used to update the per-host
   // zoom levels (if any) managed by this class (for its associated partition).
   void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change);
 
   PrefService* pref_service_;
   const base::FilePath profile_path_;
   content::HostZoomMap* host_zoom_map_;
   scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_;
   std::string partition_key_;
   base::CallbackList<void(void)> default_zoom_changed_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeZoomLevelPrefs);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_