Revert "Start the database query for the new tab page results as

soon" because TabContentsTest.NTPViewSource is crashing on linux.

This reverts commit r28549.

Review URL: http://codereview.chromium.org/273004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28551 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 34 insertions, 85 deletions

diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc
index dd006f2..6c31ade 100644
--- a/chrome/browser/dom_ui/most_visited_handler.cc
+++ b/chrome/browser/dom_ui/most_visited_handler.cc
@@ -47,12 +47,6 @@ void SetMostVisistedPage(DictionaryValue* dict,
 
 }  // namespace
 
-MostVisitedHandler::MostVisitedHandler()
-    : url_blacklist_(NULL),
-      pinned_urls_(NULL),
-      got_first_most_visited_request_(false) {
-}
-
 DOMMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
   url_blacklist_ = dom_ui->GetProfile()->GetPrefs()->
       GetMutableDictionary(prefs::kNTPMostVisitedURLsBlacklist);
@@ -76,12 +70,7 @@ DOMMessageHandler* MostVisitedHandler::Attach(DOMUI* dom_ui) {
   registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED,
       Source<Profile>(dom_ui->GetProfile()));
 
-  DOMMessageHandler* result = DOMMessageHandler::Attach(dom_ui);
-
-  // We pre-emptively make a fetch for the most visited pages so we have the
-  // results sooner.
-  StartQueryForMostVisited();
-  return result;
+  return DOMMessageHandler::Attach(dom_ui);
 }
 
 void MostVisitedHandler::RegisterMessages() {
@@ -106,28 +95,12 @@ void MostVisitedHandler::RegisterMessages() {
 }
 
 void MostVisitedHandler::HandleGetMostVisited(const Value* value) {
-  if (!got_first_most_visited_request_) {
-    // If our intial data is already here, return it.
-    if (pages_value_.get()) {
-      FundamentalValue first_run(IsFirstRun());
-      dom_ui_->CallJavascriptFunction(L"mostVisitedPages",
-                                      *(pages_value_.get()), first_run);
-      pages_value_.reset();
-    }
-    got_first_most_visited_request_ = true;
-  } else {
-    StartQueryForMostVisited();
-  }
-}
-
-void MostVisitedHandler::StartQueryForMostVisited() {
-  int page_count = NewTabUI::UseOldNewTabPage() ?
-      kOldMostVisitedPages : kMostVisitedPages;
+  const int kMostVisitedCount = 9;
   // Let's query for the number of items we want plus the blacklist size as
   // we'll be filtering-out the returned list with the blacklist URLs.
   // We do not subtract the number of pinned URLs we have because the
   // HistoryService does not know about those.
-  int result_count = page_count + url_blacklist_->GetSize();
+  int result_count = kMostVisitedCount + url_blacklist_->GetSize();
   HistoryService* hs =
       dom_ui_->GetProfile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
   hs->QuerySegmentUsageSince(
@@ -309,7 +282,7 @@ void MostVisitedHandler::OnSegmentUsageAvailable(
     CancelableRequestProvider::Handle handle,
     std::vector<PageUsageData*>* data) {
   most_visited_urls_.clear();
-  pages_value_.reset(new ListValue);
+  ListValue pages_value;
   std::set<GURL> seen_urls;
 
   size_t data_index = 0;
@@ -317,8 +290,8 @@ void MostVisitedHandler::OnSegmentUsageAvailable(
   size_t pre_populated_index = 0;
   const size_t pages_count = NewTabUI::UseOldNewTabPage() ?
       kOldMostVisitedPages : kMostVisitedPages;
-  const std::vector<MostVisitedPage> pre_populated_pages =
-      MostVisitedHandler::GetPrePopulatedPages();
+  static std::vector<MostVisitedPage> pre_populated_pages =
+        MostVisitedHandler::GetPrePopulatedPages();
 
   while (output_index < pages_count) {
     bool found = false;
@@ -358,61 +331,51 @@ void MostVisitedHandler::OnSegmentUsageAvailable(
 
     if (found) {
       // Add fillers as needed.
-      while (pages_value_->GetSize() < output_index) {
+      while (pages_value.GetSize() < output_index) {
         DictionaryValue* filler_value = new DictionaryValue();
         filler_value->SetBoolean(L"filler", true);
-        pages_value_->Append(filler_value);
+        pages_value.Append(filler_value);
       }
 
       DictionaryValue* page_value = new DictionaryValue();
       SetMostVisistedPage(page_value, mvp);
       page_value->SetBoolean(L"pinned", pinned);
-      pages_value_->Append(page_value);
+      pages_value.Append(page_value);
       most_visited_urls_.push_back(mvp.url);
       seen_urls.insert(mvp.url);
     }
     output_index++;
   }
 
-  if (got_first_most_visited_request_) {
-    FundamentalValue first_run(IsFirstRun());
-    dom_ui_->CallJavascriptFunction(L"mostVisitedPages", *(pages_value_.get()),
-                                    first_run);
-    pages_value_.reset();
-  }
-}
-
-bool MostVisitedHandler::IsFirstRun() {
   // If we found no pages we treat this as the first run.
-  bool first_run = NewTabUI::NewTabHTMLSource::first_run() &&
-      pages_value_->GetSize() ==
-          MostVisitedHandler::GetPrePopulatedPages().size();
+  FundamentalValue first_run(NewTabUI::NewTabHTMLSource::first_run() &&
+      pages_value.GetSize() == pre_populated_pages.size());
   // but first_run should only be true once.
   NewTabUI::NewTabHTMLSource::set_first_run(false);
-  return first_run;
+
+  dom_ui_->CallJavascriptFunction(L"mostVisitedPages", pages_value, first_run);
 }
 
 // static
-const std::vector<MostVisitedHandler::MostVisitedPage>&
+std::vector<MostVisitedHandler::MostVisitedPage>
     MostVisitedHandler::GetPrePopulatedPages() {
   // TODO(arv): This needs to get the data from some configurable place.
   // http://crbug.com/17630
-  static std::vector<MostVisitedPage> pages;
-  if (pages.empty()) {
-    MostVisitedPage welcome_page = {
-        l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
-        GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
-        GURL("chrome://theme/newtab_chrome_welcome_page_thumbnail"),
-        GURL("chrome://theme/newtab_chrome_welcome_page_favicon")};
-    pages.push_back(welcome_page);
-
-    MostVisitedPage gallery_page = {
-        l10n_util::GetString(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE),
-        GURL(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL))),
-        GURL("chrome://theme/newtab_themes_gallery_thumbnail"),
-        GURL("chrome://theme/newtab_themes_gallery_favicon")};
-    pages.push_back(gallery_page);
-  }
+  std::vector<MostVisitedPage> pages;
+
+  MostVisitedPage welcome_page = {
+      l10n_util::GetString(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE),
+      GURL(WideToUTF8(l10n_util::GetString(IDS_CHROME_WELCOME_URL))),
+      GURL("chrome://theme/newtab_chrome_welcome_page_thumbnail"),
+      GURL("chrome://theme/newtab_chrome_welcome_page_favicon")};
+  pages.push_back(welcome_page);
+
+  MostVisitedPage gallery_page = {
+      l10n_util::GetString(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE),
+      GURL(WideToUTF8(l10n_util::GetString(IDS_THEMES_GALLERY_URL))),
+      GURL("chrome://theme/newtab_themes_gallery_thumbnail"),
+      GURL("chrome://theme/newtab_themes_gallery_favicon")};
+  pages.push_back(gallery_page);
 
   return pages;
 }
@@ -448,3 +411,4 @@ void MostVisitedHandler::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedURLsBlacklist);
   prefs->RegisterDictionaryPref(prefs::kNTPMostVisitedPinnedURLs);
 }
+
diff --git a/chrome/browser/dom_ui/most_visited_handler.h b/chrome/browser/dom_ui/most_visited_handler.h
index 07be18c..1609fde 100644
--- a/chrome/browser/dom_ui/most_visited_handler.h
+++ b/chrome/browser/dom_ui/most_visited_handler.h
@@ -15,7 +15,6 @@
 #include "googleurl/src/gurl.h"
 
 class DictionaryValue;
-class ListValue;
 class PageUsageData;
 class PrefService;
 class Value;
@@ -33,7 +32,7 @@ class MostVisitedHandler : public DOMMessageHandler,
     GURL favicon_url;
   };
 
-  MostVisitedHandler();
+  MostVisitedHandler() : url_blacklist_(NULL), pinned_urls_(NULL) {}
   virtual ~MostVisitedHandler() { }
 
   // DOMMessageHandler override and implementation.
@@ -70,9 +69,6 @@ class MostVisitedHandler : public DOMMessageHandler,
   static void RegisterUserPrefs(PrefService* prefs);
 
  private:
-  // Send a request to the HistoryService to get the most visited pages.
-  void StartQueryForMostVisited();
-
   // Callback from the history system when the most visited list is available.
   void OnSegmentUsageAvailable(CancelableRequestProvider::Handle handle,
                                std::vector<PageUsageData*>* data);
@@ -91,10 +87,7 @@ class MostVisitedHandler : public DOMMessageHandler,
   void AddPinnedURL(const MostVisitedPage& page, int index);
   void RemovePinnedURL(const GURL& url);
 
-  // Returns true if we should treat this as the first run of the new tab page.
-  bool IsFirstRun();
-
-  static const std::vector<MostVisitedPage>& GetPrePopulatedPages();
+  static std::vector<MostVisitedPage> GetPrePopulatedPages();
 
   NotificationRegistrar registrar_;
 
@@ -108,22 +101,14 @@ class MostVisitedHandler : public DOMMessageHandler,
 
   // The URL blacklist: URLs we do not want to show in the thumbnails list.  It
   // is a dictionary for quick access (it associates a dummy boolean to the URL
-  // string).  This is owned by the PrefService.
+  // string).
   DictionaryValue* url_blacklist_;
 
   // This is a dictionary for the pinned URLs for the the most visited part of
   // the new tab page. The key of the dictionary is a hash of the URL and the
-  // value is a dictionary with title, url and index.  This is owned by the
-  // PrefService.
+  // value is a dictionary with title, url and index.
   DictionaryValue* pinned_urls_;
 
-  // We pre-fetch the first set of result pages.  This variable is false until
-  // we get the first getMostVisited() call.
-  bool got_first_most_visited_request_;
-
-  // Keep the results of the db query here.
-  scoped_ptr<ListValue> pages_value_;
-
   DISALLOW_COPY_AND_ASSIGN(MostVisitedHandler);
 };