| Index: chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
|
| diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
|
| index cb223717388d50e4aaaf6e90470e5268f3627fba..12982cf92b5e5078aeaaa7e655935a628529b336 100644
|
| --- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
|
| +++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
|
| @@ -84,7 +84,7 @@ double ChromeZoomLevelPrefs::GetDefaultZoomLevelPref() const {
|
| return default_zoom_level;
|
| }
|
|
|
| -scoped_ptr<ChromeZoomLevelPrefs::DefaultZoomLevelSubscription>
|
| +std::unique_ptr<ChromeZoomLevelPrefs::DefaultZoomLevelSubscription>
|
| ChromeZoomLevelPrefs::RegisterDefaultZoomLevelCallback(
|
| const base::Closure& callback) {
|
| return default_zoom_changed_callbacks_.Add(callback);
|
| @@ -128,7 +128,7 @@ void ChromeZoomLevelPrefs::ExtractPerHostZoomLevels(
|
| const base::DictionaryValue* host_zoom_dictionary,
|
| bool sanitize_partition_host_zoom_levels) {
|
| std::vector<std::string> keys_to_remove;
|
| - scoped_ptr<base::DictionaryValue> host_zoom_dictionary_copy =
|
| + std::unique_ptr<base::DictionaryValue> host_zoom_dictionary_copy =
|
| host_zoom_dictionary->DeepCopyWithoutEmptyChildren();
|
| for (base::DictionaryValue::Iterator i(*host_zoom_dictionary_copy);
|
| !i.IsAtEnd();
|
|
|