Move topSites API out of experimental

chrome/browser/history/history_extension_apitest.cc

 // Copyright (c) 2012 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 "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 {
  public:
   virtual void SetUpInProcessBrowserTestFixture() {
     ExtensionApiTest::SetUpInProcessBrowserTestFixture();
 
     host_resolver()->AddRule("www.a.com", "127.0.0.1");
     host_resolver()->AddRule("www.b.com", "127.0.0.1");
 
     ASSERT_TRUE(StartTestServer());
   }
 };
 
+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) {
   ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, TimedSearch) {
   ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_;
 }
 
@@ skipping 17 matching lines @@
 // Fix this as part of crbug/76170.
 #define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd
 #else
 #define MAYBE_SearchAfterAdd SearchAfterAdd
 #endif
 
 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_SearchAfterAdd) {
   ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html"))
       << message_;
 }