Move topSites API out of experimental

chrome/browser/history/history_extension_apitest.cc

Index: chrome/browser/history/history_extension_apitest.cc
diff --git a/chrome/browser/history/history_extension_apitest.cc b/chrome/browser/history/history_extension_apitest.cc
index c821b1319ef209d263cdd22305fab5bec8ea1cd4..0308fcfc5b8ee7df835ca98ed5c8f18be42a9d4b 100644
--- a/chrome/browser/history/history_extension_apitest.cc
+++ b/chrome/browser/history/history_extension_apitest.cc
@@ -5,6 +5,8 @@
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 
 class HistoryExtensionApiTest : public ExtensionApiTest {
@@ -19,6 +21,52 @@ class HistoryExtensionApiTest : public ExtensionApiTest {
   }
 };
 
+IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, GetMostVisited) {
+  ASSERT_TRUE(RunExtensionSubtest("history", "test1.html"))
+      << message_;
+  const Extension* extension = GetSingleLoadedExtension();
+  ASSERT_TRUE(extension) << message_;
+
+  // Navigate to the web pages multiple times to build up history.
+  ResultCatcher catcher;
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test1.html")));

[Aaron Boodman, 2012/03/20 02:24:24]

It looks like these files don't do anything other than call
chrome.test.succeed(). In their only purpose is to create history, they can just
be empty files, and you can remove catcher.GetNextResult().

Also, can you express this as a nested loop instead of the duplicated code?

+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test1.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test1.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test2.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test2.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test2.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test3.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("test3.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  // Finally, call the getMostVisited tests.
+  ui_test_utils::NavigateToURL(browser(),
+      GURL(extension->GetResourceURL("get_most_visited.html")));
+  ASSERT_TRUE(catcher.GetNextResult());
+}
+
 // Full text search indexing sometimes exceeds a timeout.
 // Fix this as part of crbug/76170.
 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_MiscSearch) {