Get rid of PrefService::GetMutableDictionary/GetMutableList

chrome/browser/ui/webui/most_visited_handler.cc

 // Copyright (c) 2011 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/most_visited_handler.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/new_tab_ui.h"
 #include "chrome/browser/ui/webui/thumbnail_source.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_source.h"
 #include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
@@ skipping 15 matching lines @@
 // This struct is used when getting the pre-populated pages in case the user
 // hasn't filled up his most visited pages.
 struct MostVisitedHandler::MostVisitedPage {
   string16 title;
   GURL url;
   GURL thumbnail_url;
   GURL favicon_url;
 };
 
 MostVisitedHandler::MostVisitedHandler()
-    : url_blacklist_(NULL),
-      pinned_urls_(NULL),
-      got_first_most_visited_request_(false) {
+    : got_first_most_visited_request_(false) {
 }
 
 MostVisitedHandler::~MostVisitedHandler() {
 }
 
 WebUIMessageHandler* MostVisitedHandler::Attach(WebUI* web_ui) {
   Profile* profile = web_ui->GetProfile();
-  url_blacklist_ = profile->GetPrefs()->GetMutableDictionary(
-      prefs::kNTPMostVisitedURLsBlacklist);
-  pinned_urls_ = profile->GetPrefs()->GetMutableDictionary(
-      prefs::kNTPMostVisitedPinnedURLs);
   // Set up our sources for thumbnail and favicon data.
   ThumbnailSource* thumbnail_src = new ThumbnailSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(thumbnail_src);
 
   FaviconSource* favicon_src = new FaviconSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(favicon_src);
 
   // Get notifications when history is cleared.
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
                  Source<Profile>(profile));
@@ skipping 32 matching lines @@
     // If our intial data is already here, return it.
     SendPagesValue();
     got_first_most_visited_request_ = true;
   } else {
     StartQueryForMostVisited();
   }
 }
 
 void MostVisitedHandler::SendPagesValue() {
   if (pages_value_.get()) {
-    bool has_blacklisted_urls = !url_blacklist_->empty();
-    history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+    Profile* profile = web_ui_->GetProfile();
+    const DictionaryValue* url_blacklist =
+        profile->GetPrefs()->GetDictionary(prefs::kNTPMostVisitedURLsBlacklist);
+    bool has_blacklisted_urls = !url_blacklist->empty();
+    history::TopSites* ts = profile->GetTopSites();
     if (ts)
       has_blacklisted_urls = ts->HasBlacklistedItems();
     FundamentalValue first_run(IsFirstRun());
     FundamentalValue has_blacklisted_urls_value(has_blacklisted_urls);
     web_ui_->CallJavascriptFunction("mostVisitedPages",
                                     *(pages_value_.get()),
                                     first_run,
                                     has_blacklisted_urls_value);
     pages_value_.reset();
   }
@@ skipping 92 matching lines @@
   if (ts)
     ts->RemovePinnedURL(url);
 }
 
 bool MostVisitedHandler::GetPinnedURLAtIndex(int index,
                                              MostVisitedPage* page) {
   // This iterates over all the pinned URLs. It might seem like it is worth
   // having a map from the index to the item but the number of items is limited
   // to the number of items the most visited section is showing on the NTP so
   // this will be fast enough for now.
-  for (DictionaryValue::key_iterator it = pinned_urls_->begin_keys();
-      it != pinned_urls_->end_keys(); ++it) {
+  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  const DictionaryValue* pinned_urls =
+      prefs->GetDictionary(prefs::kNTPMostVisitedPinnedURLs);
+  for (DictionaryValue::key_iterator it = pinned_urls->begin_keys();
+      it != pinned_urls->end_keys(); ++it) {
     Value* value;
-    if (pinned_urls_->GetWithoutPathExpansion(*it, &value)) {
+    if (pinned_urls->GetWithoutPathExpansion(*it, &value)) {
       if (!value->IsType(DictionaryValue::TYPE_DICTIONARY)) {
         // Moved on to TopSites and now going back.
-        pinned_urls_->Clear();
+        DictionaryPrefUpdate update(prefs, prefs::kNTPMostVisitedPinnedURLs);
+        update.Get()->Clear();
         return false;
       }
 
       int dict_index;
-      DictionaryValue* dict = static_cast<DictionaryValue*>(value);
+      const DictionaryValue* dict = static_cast<DictionaryValue*>(value);
       if (dict->GetInteger("index", &dict_index) && dict_index == index) {
         // The favicon and thumbnail URLs may be empty.
         std::string tmp_string;
         if (dict->GetString("faviconUrl", &tmp_string))
           page->favicon_url = GURL(tmp_string);
         if (dict->GetString("thumbnailUrl", &tmp_string))
           page->thumbnail_url = GURL(tmp_string);
 
         if (dict->GetString("url", &tmp_string))
           page->url = GURL(tmp_string);
@@ skipping 118 matching lines @@
 
 // static
 std::vector<GURL> MostVisitedHandler::GetPrePopulatedUrls() {
   const std::vector<MostVisitedPage> pages =
       MostVisitedHandler::GetPrePopulatedPages();
   std::vector<GURL> page_urls;
   for (size_t i = 0; i < pages.size(); ++i)
     page_urls.push_back(pages[i].url);
   return page_urls;
 }