1 files changed, 19 insertions, 11 deletions

diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index bb10fe7..5b49973 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.cc
@@ -135,7 +135,8 @@ void MostVisitedHandler::SendPagesValue() {
     bool has_blacklisted_urls = !url_blacklist_->empty();
     if (history::TopSites::IsEnabled()) {
       history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-      has_blacklisted_urls = ts->HasBlacklistedItems();
+      if (ts)
+        has_blacklisted_urls = ts->HasBlacklistedItems();
     }
     FundamentalValue first_run(IsFirstRun());
     FundamentalValue has_blacklisted_urls_value(has_blacklisted_urls);
@@ -151,9 +152,11 @@ void MostVisitedHandler::StartQueryForMostVisited() {
   if (history::TopSites::IsEnabled()) {
     // Use TopSites.
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    ts->GetMostVisitedURLs(
-        &topsites_consumer_,
-        NewCallback(this, &MostVisitedHandler::OnMostVisitedURLsAvailable));
+    if (ts) {
+      ts->GetMostVisitedURLs(
+          &topsites_consumer_,
+          NewCallback(this, &MostVisitedHandler::OnMostVisitedURLsAvailable));
+    }
     return;
   }
 
@@ -195,7 +198,8 @@ void MostVisitedHandler::HandleRemoveURLsFromBlacklist(const ListValue* args) {
                               dom_ui_->GetProfile());
     if (history::TopSites::IsEnabled()) {
       history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-      ts->RemoveBlacklistedURL(GURL(url));
+      if (ts)
+        ts->RemoveBlacklistedURL(GURL(url));
       return;
     }
 
@@ -210,7 +214,8 @@ void MostVisitedHandler::HandleClearBlacklist(const ListValue* args) {
 
   if (history::TopSites::IsEnabled()) {
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    ts->ClearBlacklistedURLs();
+    if (ts)
+      ts->ClearBlacklistedURLs();
     return;
   }
 
@@ -254,7 +259,8 @@ void MostVisitedHandler::HandleAddPinnedURL(const ListValue* args) {
 void MostVisitedHandler::AddPinnedURL(const MostVisitedPage& page, int index) {
   if (history::TopSites::IsEnabled()) {
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    ts->AddPinnedURL(page.url, index);
+    if (ts)
+      ts->AddPinnedURL(page.url, index);
     return;
   }
 
@@ -283,7 +289,8 @@ void MostVisitedHandler::HandleRemovePinnedURL(const ListValue* args) {
 void MostVisitedHandler::RemovePinnedURL(const GURL& url) {
   if (history::TopSites::IsEnabled()) {
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    ts->RemovePinnedURL(url);
+    if (ts)
+      ts->RemovePinnedURL(url);
     return;
   }
 
@@ -442,14 +449,14 @@ void MostVisitedHandler::SetPagesValueFromTopSites(
     }
 
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    if (ts->IsURLPinned(url.url))
+    if (ts && ts->IsURLPinned(url.url))
       page_value->SetBoolean("pinned", true);
     pages_value_->Append(page_value);
   }
 }
 
 void MostVisitedHandler::OnMostVisitedURLsAvailable(
-    history::MostVisitedURLList data) {
+    const history::MostVisitedURLList& data) {
   SetPagesValueFromTopSites(data);
   if (got_first_most_visited_request_) {
     SendPagesValue();
@@ -518,7 +525,8 @@ void MostVisitedHandler::Observe(NotificationType type,
 void MostVisitedHandler::BlacklistURL(const GURL& url) {
   if (history::TopSites::IsEnabled()) {
     history::TopSites* ts = dom_ui_->GetProfile()->GetTopSites();
-    ts->AddBlacklistedURL(url);
+    if (ts)
+      ts->AddBlacklistedURL(url);
     return;
   }