Revert of Fix InputImeApiTest.SendKeyEventsOnNormalPage trybot failure.

chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc

Index: chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc
diff --git a/chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc b/chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc
index 6243afd7c7cb1a4adc3ffd57c50ddb58b6c39a5f..0e205161b29f6a014f26a07c1f4797afec3fef96 100644
--- a/chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc
+++ b/chrome/browser/ui/views/ime/input_ime_apitest_nonchromeos.cc
@@ -7,7 +7,6 @@
 #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -17,7 +16,6 @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/input_method.h"
-#include "url/origin.h"
 
 namespace extensions {
 
@@ -109,8 +107,7 @@ IN_PROC_BROWSER_TEST_F(InputImeApiTest, BasicApiTest) {
 
 IN_PROC_BROWSER_TEST_F(InputImeApiTest, SendKeyEventsOnNormalPage) {
   // Navigates to special page that sendKeyEvents API has limition with.
-  GURL test_url(chrome::kChromeUINewTabURL);
-  ui_test_utils::NavigateToURL(browser(), test_url);
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
   // Manipulates the focused text input client because the follow cursor
   // window requires the text input focus.
   ui::InputMethod* input_method =
@@ -125,34 +122,26 @@ IN_PROC_BROWSER_TEST_F(InputImeApiTest, SendKeyEventsOnNormalPage) {
 
   ASSERT_TRUE(RunExtensionTest("input_ime_nonchromeos")) << message_;
 
-  content::WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  url::Origin origin(web_contents->GetLastCommittedURL());
-
-  // Don't check events if the url has not been correctly set.
-  if (url::Origin(test_url).IsSameOriginWith(origin)) {
-    std::vector<std::unique_ptr<ui::KeyEvent>> key_events;
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE)));
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_NONE)));
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_CONTROL_DOWN)));
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(new ui::KeyEvent(
-        ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_CONTROL_DOWN)));
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_TAB, ui::EF_NONE)));
-
-    EXPECT_TRUE(CompareKeyEvents(key_events, input_method));
-  }
+  std::vector<std::unique_ptr<ui::KeyEvent>> key_events;
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE)));
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_NONE)));
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_CONTROL_DOWN)));
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_CONTROL_DOWN)));
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_TAB, ui::EF_NONE)));
+
+  EXPECT_TRUE(CompareKeyEvents(key_events, input_method));
 
   input_method->DetachTextInputClient(client.get());
 }
 
 IN_PROC_BROWSER_TEST_F(InputImeApiTest, SendKeyEventsOnSpecialPage) {
   // Navigates to special page that sendKeyEvents API has limition with.
-  GURL test_url("chrome://flags");
-  ui_test_utils::NavigateToURL(browser(), test_url);
+  ui_test_utils::NavigateToURL(browser(), GURL("chrome://flags"));
 
   ui::InputMethod* input_method =
       browser()->window()->GetNativeWindow()->GetHost()->GetInputMethod();
@@ -166,20 +155,13 @@ IN_PROC_BROWSER_TEST_F(InputImeApiTest, SendKeyEventsOnSpecialPage) {
 
   ASSERT_TRUE(RunExtensionTest("input_ime_nonchromeos")) << message_;
 
-  content::WebContents* web_contents =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  url::Origin origin(web_contents->GetLastCommittedURL());
+  std::vector<std::unique_ptr<ui::KeyEvent>> key_events;
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE)));
+  key_events.push_back(std::unique_ptr<ui::KeyEvent>(
+      new ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_NONE)));
 
-  // Don't check events if the url has not been correctly set.
-  if (url::Origin(test_url).IsSameOriginWith(origin)) {
-    std::vector<std::unique_ptr<ui::KeyEvent>> key_events;
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE)));
-    key_events.push_back(std::unique_ptr<ui::KeyEvent>(
-        new ui::KeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, ui::EF_NONE)));
-
-    EXPECT_TRUE(CompareKeyEvents(key_events, input_method));
-  }
+  EXPECT_TRUE(CompareKeyEvents(key_events, input_method));
   input_method->DetachTextInputClient(client.get());
 }