Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / omnibox / omnibox_view_views_browsertest.cc

diff --git a/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
index 9a8ac60..66f6731 100644 (file)
--- a/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
+++ b/src/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -5,20 +5,19 @@
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include "base/command_line.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/omnibox/location_bar.h"
+#include "chrome/browser/ui/browser_window_testing_views.h"
+#include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
-#include "grit/generated_resources.h"
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/ime/text_input_focus_manager.h"
@@ -26,6 +25,7 @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
 
 class OmniboxViewViewsTest : public InProcessBrowserTest {
@@ -71,35 +71,22 @@ class OmniboxViewViewsTest : public InProcessBrowserTest {
   void TapBrowserWindowCenter() {
     gfx::Point center = BrowserView::GetBrowserViewForBrowser(
         browser())->GetBoundsInScreen().CenterPoint();
-    aura::test::EventGenerator generator(browser()->window()->
-        GetNativeWindow()->GetRootWindow());
+    ui::test::EventGenerator generator(browser()->window()->GetNativeWindow());
     generator.GestureTapAt(center);
   }
 
   // Touch down and release at the specified locations.
   void Tap(const gfx::Point& press_location,
            const gfx::Point& release_location) {
-    ui::EventProcessor* dispatcher =
-        browser()->window()->GetNativeWindow()->GetHost()->event_processor();
-
-    base::TimeDelta timestamp = ui::EventTimeForNow();
-    ui::TouchEvent press(
-        ui::ET_TOUCH_PRESSED, press_location, 5, timestamp);
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
-    ASSERT_FALSE(details.dispatcher_destroyed);
-
-    if (press_location != release_location) {
-      timestamp += base::TimeDelta::FromMilliseconds(10);
-      ui::TouchEvent move(
-          ui::ET_TOUCH_MOVED, release_location, 5, timestamp);
-      details = dispatcher->OnEventFromSource(&move);
+    ui::test::EventGenerator generator(browser()->window()->GetNativeWindow());
+    if (press_location == release_location) {
+      generator.GestureTapAt(press_location);
+    } else {
+      generator.GestureScrollSequence(press_location,
+                                      release_location,
+                                      base::TimeDelta::FromMilliseconds(10),
+                                      1);
     }
-
-    timestamp += base::TimeDelta::FromMilliseconds(50);
-    ui::TouchEvent release(
-        ui::ET_TOUCH_RELEASED, release_location, 5, timestamp);
-    details = dispatcher->OnEventFromSource(&release);
-    ASSERT_FALSE(details.dispatcher_destroyed);
   }
 
  private:
@@ -270,7 +257,9 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, CloseOmniboxPopupOnTextDrag) {
   match.destination_url = GURL("http://autocomplete-result2/");
   matches.push_back(match);
   results.AppendMatches(matches);
-  results.SortAndCull(AutocompleteInput(), browser()->profile());
+  results.SortAndCull(
+      AutocompleteInput(),
+      TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   // The omnibox popup should open with suggestions displayed.
   omnibox_view->model()->popup_model()->OnResultChanged();