Removal of Profile from content part 6.

chrome/browser/ui/webui/ntp/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/ntp/most_visited_handler.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 36 matching lines @@
 };
 
 MostVisitedHandler::MostVisitedHandler()
     : got_first_most_visited_request_(false) {
 }
 
 MostVisitedHandler::~MostVisitedHandler() {
 }
 
 WebUIMessageHandler* MostVisitedHandler::Attach(WebUI* web_ui) {
-  Profile* profile = web_ui->GetProfile();
+  Profile* profile = Profile::FromWebUI(web_ui);
   // Set up our sources for thumbnail and favicon data.
   ThumbnailSource* thumbnail_src = new ThumbnailSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(thumbnail_src);
 
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui);
 
   history::TopSites* ts = profile->GetTopSites();
@@ skipping 39 matching lines @@
     // If our initial data is already here, return it.
     SendPagesValue();
     got_first_most_visited_request_ = true;
   } else {
     StartQueryForMostVisited();
   }
 }
 
 void MostVisitedHandler::SendPagesValue() {
   if (pages_value_.get()) {
-    Profile* profile = web_ui_->GetProfile();
+    Profile* profile = Profile::FromWebUI(web_ui_);
     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 has_blacklisted_urls_value(has_blacklisted_urls);
     web_ui_->CallJavascriptFunction("setMostVisitedPages",
                                     *(pages_value_.get()),
                                     has_blacklisted_urls_value);
     pages_value_.reset();
   }
 }
 
 void MostVisitedHandler::StartQueryForMostVisited() {
-  history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+  history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
   if (ts) {
     ts->GetMostVisitedURLs(
         &topsites_consumer_,
         NewCallback(this, &MostVisitedHandler::OnMostVisitedURLsAvailable));
   }
 }
 
 void MostVisitedHandler::HandleBlacklistURL(const ListValue* args) {
   std::string url = UTF16ToUTF8(ExtractStringValue(args));
   BlacklistURL(GURL(url));
 }
 
 void MostVisitedHandler::HandleRemoveURLsFromBlacklist(const ListValue* args) {
   DCHECK(args->GetSize() != 0);
 
   for (ListValue::const_iterator iter = args->begin();
        iter != args->end(); ++iter) {
     std::string url;
     bool r = (*iter)->GetAsString(&url);
     if (!r) {
       NOTREACHED();
       return;
     }
     UserMetrics::RecordAction(UserMetricsAction("MostVisited_UrlRemoved"));
-    history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+    history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
     if (ts)
       ts->RemoveBlacklistedURL(GURL(url));
   }
 }
 
 void MostVisitedHandler::HandleClearBlacklist(const ListValue* args) {
   UserMetrics::RecordAction(UserMetricsAction("MostVisited_BlacklistCleared"));
 
-  history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+  history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
   if (ts)
     ts->ClearBlacklistedURLs();
 }
 
 void MostVisitedHandler::HandleAddPinnedURL(const ListValue* args) {
   DCHECK_EQ(5U, args->GetSize()) << "Wrong number of params to addPinnedURL";
   MostVisitedPage mvp;
   std::string tmp_string;
   string16 tmp_string16;
   int index;
@@ skipping 19 matching lines @@
     mvp.thumbnail_url = GURL(tmp_string);
 
   r = args->GetString(4, &tmp_string);
   DCHECK(r) << "Missing index in addPinnedURL from the NTP Most Visited.";
   base::StringToInt(tmp_string, &index);
 
   AddPinnedURL(mvp, index);
 }
 
 void MostVisitedHandler::AddPinnedURL(const MostVisitedPage& page, int index) {
-  history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+  history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
   if (ts)
     ts->AddPinnedURL(page.url, index);
   UserMetrics::RecordAction(UserMetricsAction("MostVisited_UrlPinned"));
 }
 
 void MostVisitedHandler::HandleRemovePinnedURL(const ListValue* args) {
   std::string url = UTF16ToUTF8(ExtractStringValue(args));
   RemovePinnedURL(GURL(url));
 }
 
 void MostVisitedHandler::RemovePinnedURL(const GURL& url) {
-  history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+  history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
   if (ts)
     ts->RemovePinnedURL(url);
   UserMetrics::RecordAction(UserMetricsAction("MostVisited_UrlUnpinned"));
 }
 
 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.
-  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  PrefService* prefs = Profile::FromWebUI(web_ui_)->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 (!value->IsType(DictionaryValue::TYPE_DICTIONARY)) {
         // Moved on to TopSites and now going back.
         DictionaryPrefUpdate update(prefs, prefs::kNTPMostVisitedPinnedURLs);
         update.Get()->Clear();
@@ skipping 48 matching lines @@
       page_value->SetString("thumbnailUrl",
           "chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL");
       page_value->SetString("faviconDominantColor", "rgb(0, 147, 60)");
     } else if (url.url.spec() ==
                l10n_util::GetStringUTF8(IDS_WEBSTORE_URL)) {
       page_value->SetString("thumbnailUrl",
           "chrome://theme/IDR_NEWTAB_WEBSTORE_THUMBNAIL");
       page_value->SetString("faviconDominantColor", "rgb(63, 132, 197)");
     }
 
-    history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+    history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
     if (ts && ts->IsURLPinned(url.url))
       page_value->SetBoolean("pinned", true);
     pages_value_->Append(page_value);
   }
 }
 
 void MostVisitedHandler::OnMostVisitedURLsAvailable(
     const history::MostVisitedURLList& data) {
   SetPagesValueFromTopSites(data);
   if (got_first_most_visited_request_) {
     SendPagesValue();
   }
 }
 
 void MostVisitedHandler::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_TOP_SITES_CHANGED);
 
   // Most visited urls changed, query again.
   StartQueryForMostVisited();
 }
 
 void MostVisitedHandler::BlacklistURL(const GURL& url) {
-  history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
+  history::TopSites* ts = Profile::FromWebUI(web_ui_)->GetTopSites();
   if (ts)
     ts->AddBlacklistedURL(url);
   UserMetrics::RecordAction(UserMetricsAction("MostVisited_UrlBlacklisted"));
 }
 
 std::string MostVisitedHandler::GetDictionaryKeyForURL(const std::string& url) {
   return base::MD5String(url);
 }
 
 // static
 void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist,
                                 PrefService::UNSYNCABLE_PREF);
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs,
                                 PrefService::UNSYNCABLE_PREF);
 }