Add pyauto hook for getting and manipulating the data underneath the NTP.

chrome/browser/history/top_sites.cc

Index: chrome/browser/history/top_sites.cc
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 8bdfe340f55137be2f2306364313fcb213dc564e..4cfc121b84bf4c1c6e7311dcb837ab147f1bcedb 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -440,6 +440,23 @@ void TopSites::DiffMostVisited(const MostVisitedURLList& old_list,
   }
 }
 
+CancelableRequestProvider::Handle TopSites::StartQueryForMostVisited() {
+  if (!profile_)

[sky, 2010/11/17 16:31:00]

DCHECK(loaded_).

Any pyauto test needing top sites should block until loaded.

[kkania, 2010/11/17 22:16:08]

Done.

+    return NULL;
+
+  CancelableRequestProvider::Handle request_handle = NULL;
+  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+  // |hs| may be null during unit tests.
+  if (hs) {
+    request_handle = hs->QueryMostVisitedURLs(

[sky, 2010/11/17 16:31:00]

return hs->...

[kkania, 2010/11/17 22:16:08]

Done.

+        num_results_to_request_from_history(),
+        kDaysOfHistory,
+        &cancelable_consumer_,
+        NewCallback(this, &TopSites::OnTopSitesAvailableFromHistory));
+  }
+  return request_handle;

[sky, 2010/11/17 16:31:00]

return NULL

[kkania, 2010/11/17 22:16:08]

Done.

+}
+
 TopSites::~TopSites() {
 }
 
@@ -533,19 +550,8 @@ void TopSites::AddTemporaryThumbnail(const GURL& url,
   temp_images_.push_back(image);
 }
 
-void TopSites::StartQueryForMostVisited() {
-  if (!profile_)
-    return;
-
-  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  // |hs| may be null during unit tests.
-  if (hs) {
-    hs->QueryMostVisitedURLs(
-        num_results_to_request_from_history(),
-        kDaysOfHistory,
-        &cancelable_consumer_,
-        NewCallback(this, &TopSites::OnTopSitesAvailableFromHistory));
-  }
+void TopSites::TimerFired() {
+  StartQueryForMostVisited();
 }
 
 // static
@@ -844,7 +850,7 @@ void TopSites::RestartQueryForTopSitesTimer(base::TimeDelta delta) {
 
   timer_start_time_ = base::TimeTicks::Now();
   timer_.Stop();
-  timer_.Start(delta, this, &TopSites::StartQueryForMostVisited);
+  timer_.Start(delta, this, &TopSites::TimerFired);
 }
 
 void TopSites::OnHistoryMigrationWrittenToDisk(TopSitesBackend::Handle handle) {
@@ -902,6 +908,12 @@ void TopSites::OnTopSitesAvailableFromHistory(
     CancelableRequestProvider::Handle handle,
     MostVisitedURLList pages) {
   SetTopSites(pages);
+
+  // Used only in testing.
+  NotificationService::current()->Notify(
+      NotificationType::TOP_SITES_UPDATED,
+      Source<TopSites>(this),
+      Details<CancelableRequestProvider::Handle>(&handle));
 }
 
 }  // namespace history