Removal of Profile from content part 6.

chrome/browser/ui/webui/history_ui.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/history_ui.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 115 matching lines @@
     : search_text_() {
 }
 
 BrowsingHistoryHandler::~BrowsingHistoryHandler() {
   cancelable_search_consumer_.CancelAllRequests();
   cancelable_delete_consumer_.CancelAllRequests();
 }
 
 WebUIMessageHandler* BrowsingHistoryHandler::Attach(WebUI* web_ui) {
   // Create our favicon data source.
-  Profile* profile = web_ui->GetProfile();
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui->tab_contents()->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   // Get notifications when history is cleared.
   registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
       Source<Profile>(profile->GetOriginalProfile()));
   return WebUIMessageHandler::Attach(web_ui);
 }
 
 void BrowsingHistoryHandler::RegisterMessages() {
@@ skipping 18 matching lines @@
   // Set our query options.
   history::QueryOptions options;
   options.begin_time = base::Time::Now().LocalMidnight();
   options.begin_time -= base::TimeDelta::FromDays(day);
   options.end_time = base::Time::Now().LocalMidnight();
   options.end_time -= base::TimeDelta::FromDays(day - 1);
 
   // Need to remember the query string for our results.
   search_text_ = string16();
 
-  HistoryService* hs =
-      web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());

[jam, 2011/08/09 16:11:19]

nit: given how many times I see this line so far, do you think it would make
sense to have a convenience function like Profile::FromWebUI?

+  HistoryService* hs = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
       &cancelable_search_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
 
 void BrowsingHistoryHandler::HandleSearchHistory(const ListValue* args) {
   // Anything in-flight is invalid.
   cancelable_search_consumer_.CancelAllRequests();
 
   // Get arguments (if any).
   int month = 0;
   string16 query;
   ExtractSearchHistoryArguments(args, &month, &query);
 
   // Set the query ranges for the given month.
   history::QueryOptions options = CreateMonthQueryOptions(month);
 
   // When searching, limit the number of results returned.
   options.max_count = kMaxSearchResults;
 
   // Need to remember the query string for our results.
   search_text_ = query;
-  HistoryService* hs =
-      web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  HistoryService* hs = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QueryHistory(search_text_,
       options,
       &cancelable_search_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::QueryComplete));
 }
 
 void BrowsingHistoryHandler::HandleRemoveURLsOnOneDay(const ListValue* args) {
   if (cancelable_delete_consumer_.HasPendingRequests()) {
     web_ui_->CallJavascriptFunction("deleteFailed");
     return;
@@ skipping 15 matching lines @@
        v != args->end(); ++v) {
     if ((*v)->GetType() != Value::TYPE_STRING)
       continue;
     const StringValue* string_value = static_cast<const StringValue*>(*v);
     string16 string16_value;
     if (!string_value->GetAsString(&string16_value))
       continue;
     urls.insert(GURL(string16_value));
   }
 
-  HistoryService* hs =
-      web_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  HistoryService* hs = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->ExpireHistoryBetween(
       urls, begin_time, end_time, &cancelable_delete_consumer_,
       NewCallback(this, &BrowsingHistoryHandler::RemoveComplete));
 }
 
 void BrowsingHistoryHandler::HandleClearBrowsingData(const ListValue* args) {
   // TODO(beng): This is an improper direct dependency on Browser. Route this
   // through some sort of delegate.
-  Browser* browser = BrowserList::FindBrowserWithProfile(web_ui_->GetProfile());
+  Profile* profile =
+      Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
+  Browser* browser = BrowserList::FindBrowserWithProfile(profile);
   if (browser)
     browser->OpenClearBrowsingDataDialog();
 }
 
 void BrowsingHistoryHandler::QueryComplete(
     HistoryService::Handle request_handle,
     history::QueryResults* results) {
 
   ListValue results_value;
   base::Time midnight_today = base::Time::Now().LocalMidnight();
@@ skipping 26 matching lines @@
             base::TimeFormatFriendlyDate(page.visit_time()));
       }
       page_value->SetString("dateRelativeDay", date_str);
       page_value->SetString("dateTimeOfDay",
           base::TimeFormatTimeOfDay(page.visit_time()));
     } else {
       page_value->SetString("dateShort",
           base::TimeFormatShortDate(page.visit_time()));
       page_value->SetString("snippet", page.snippet().text());
     }
+    Profile* profile =
+        Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
     page_value->SetBoolean("starred",
-        web_ui_->GetProfile()->GetBookmarkModel()->IsBookmarked(page.url()));
+        profile->GetBookmarkModel()->IsBookmarked(page.url()));
     results_value.Append(page_value);
   }
 
   DictionaryValue info_value;
   info_value.SetString("term", search_text_);
   info_value.SetBoolean("finished", results->reached_beginning());
 
   web_ui_->CallJavascriptFunction("historyResult", info_value, results_value);
 }
 
@@ skipping 91 matching lines @@
 const GURL HistoryUI::GetHistoryURLWithSearchText(const string16& text) {
   return GURL(std::string(chrome::kChromeUIHistoryURL) + "#q=" +
               EscapeQueryParamValue(UTF16ToUTF8(text), true));
 }
 
 // static
 RefCountedMemory* HistoryUI::GetFaviconResourceBytes() {
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_HISTORY_FAVICON);
 }