Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / test / base / ui_test_utils.h

diff --git a/src/chrome/test/base/ui_test_utils.h b/src/chrome/test/base/ui_test_utils.h
index 8ed553a..9e690d1 100644 (file)
--- a/src/chrome/test/base/ui_test_utils.h
+++ b/src/chrome/test/base/ui_test_utils.h
@@ -28,7 +28,6 @@
 
 class AppModalDialog;
 class Browser;
-class DevToolsWindow;
 class LocationBar;
 class Profile;
 class SkBitmap;
@@ -111,9 +110,6 @@ void NavigateToURLBlockUntilNavigationsComplete(Browser* browser,
                                                 const GURL& url,
                                                 int number_of_navigations);
 
-// Blocks until DevTools window is loaded.
-void WaitUntilDevToolsWindowLoaded(DevToolsWindow* window);
-
 // Generate the file path for testing a particular test.
 // The file for the tests is all located in
 // test_root_directory/dir/<file>
@@ -301,12 +297,11 @@ class HistoryEnumerator {
  private:
   void HistoryQueryComplete(
       const base::Closure& quit_task,
-      HistoryService::Handle request_handle,
       history::QueryResults* results);
 
   std::vector<GURL> urls_;
 
-  CancelableRequestConsumer consumer_;
+  base::CancelableTaskTracker tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
 };