Convert the history pyauto tests to a browser_tests.

chrome/test/base/ui_test_utils.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 
 #include <map>
 #include <queue>
 #include <set>
@@ skipping 151 matching lines @@
 
 // Blocks until |model| finishes loading.
 void WaitForBookmarkModelToLoad(BookmarkModel* model);
 
 // Blocks until |service| finishes loading.
 void WaitForTemplateURLServiceToLoad(TemplateURLService* service);
 
 // Blocks until the |history_service|'s history finishes loading.
 void WaitForHistoryToLoad(HistoryService* history_service);
 
+// Download the given file and waits for the download to complete.
+void DownloadURL(Browser* browser, const GURL& download_url);
+
 // Brings the native window for |browser| to the foreground. Returns true on
 // success.
 bool BringBrowserWindowToFront(const Browser* browser) WARN_UNUSED_RESULT;
 
 // Gets the first browser that is not in the specified set.
 Browser* GetBrowserNotInSet(std::set<Browser*> excluded_browsers);
 
 // Sends a key press, blocking until the key press is received or the test times
 // out. This uses ui_controls::SendKeyPress, see it for details. Returns true
 // if the event was successfully sent and received.
@@ skipping 246 matching lines @@
 namespace internal {
 
 // A utility function to send a mouse click event in a closure. It's shared by
 // ui_controls_linux.cc and ui_controls_mac.cc
 void ClickTask(ui_controls::MouseButton button,
                int state,
                const base::Closure& followup);
 
 }  // namespace internal
 
-// Enumerates all history contents on the backend thread.
-class HistoryEnumerator : public HistoryService::URLEnumerator {
+// Enumerates all history contents on the backend thread. Returns them in
+// descending order by time.
+class HistoryEnumerator {
  public:
-  explicit HistoryEnumerator(HistoryService* history);
-  virtual ~HistoryEnumerator();
-
-  // HistoryService::URLEnumerator:
-  virtual void OnURL(const GURL& url) OVERRIDE;
-  virtual void OnComplete(bool success) OVERRIDE;
+  explicit HistoryEnumerator(Profile* profile);
+  ~HistoryEnumerator();
 
   std::vector<GURL>& urls() { return urls_; }
 
  private:
+  void HistoryQueryComplete(
+      const base::Closure& quit_task,
+      HistoryService::Handle request_handle,
+      history::QueryResults* results);
+
   std::vector<GURL> urls_;
 
+  CancelableRequestConsumer consumer_;
+
   DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
 };
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_