Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / search / instant_extended_interactive_uitest.cc

diff --git a/src/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/src/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index e06c77f..7422dcd 100644 (file)
--- a/src/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/src/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -16,9 +16,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
-#include "chrome/browser/autocomplete/autocomplete_match.h"
-#include "chrome/browser/autocomplete/autocomplete_provider.h"
-#include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -34,7 +31,6 @@
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
@@ -59,6 +55,10 @@
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/history/core/common/thumbnail_score.h"
+#include "components/omnibox/autocomplete_match.h"
+#include "components/omnibox/autocomplete_provider.h"
+#include "components/omnibox/autocomplete_result.h"
+#include "components/search_engines/template_url_service.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -79,7 +79,6 @@
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
 using testing::HasSubstr;
@@ -226,8 +225,11 @@ class InstantExtendedTest : public InProcessBrowserTest,
     DCHECK(history);
     DCHECK(base::MessageLoop::current());
 
-    CancelableRequestConsumer consumer;
-    history->ScheduleDBTask(new QuittingHistoryDBTask(), &consumer);
+    base::CancelableTaskTracker tracker;
+    history->ScheduleDBTask(
+        scoped_ptr<history::HistoryDBTask>(
+            new QuittingHistoryDBTask()),
+        &tracker);
     base::MessageLoop::current()->Run();
   }
 
@@ -293,8 +295,8 @@ class InstantExtendedNetworkTest : public InstantExtendedTest {
     InstantExtendedTest::SetUpOnMainThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
-    InstantExtendedTest::CleanUpOnMainThread();
+  virtual void TearDownOnMainThread() OVERRIDE {
+    InstantExtendedTest::TearDownOnMainThread();
     fake_network_change_notifier_.reset();
     disable_for_test_.reset();
   }