Revert of Fix InputImeApiTest.SendKeyEventsOnNormalPage trybot failure.

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

 // Copyright 2016 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.
 
 #include "base/auto_reset.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "extensions/test/extension_test_message_listener.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #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 {
 
 class InputImeApiTest : public ExtensionApiTest {
  public:
   InputImeApiTest() {}
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
@@ skipping 71 matching lines @@
   std::unique_ptr<ui::DummyTextInputClient> client2(
       new ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT));
   input_method->SetFocusedTextInputClient(client2.get());
   ASSERT_TRUE(blur_listener.WaitUntilSatisfied()) << message_;
 
   input_method->DetachTextInputClient(client2.get());
 }
 
 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 =
       browser()->window()->GetNativeWindow()->GetHost()->GetInputMethod();
   std::unique_ptr<ui::DummyTextInputClient> client(
       new ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT));
   input_method->SetFocusedTextInputClient(client.get());
   ExtensionFunction::ScopedUserGestureForTests scoped_user_gesture;
   base::AutoReset<bool> auto_reset_disable_bubble(
       &InputImeActivateFunction::disable_bubble_for_testing_, true);
   SetTrackKeyEvents(input_method, true);
 
   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)));
+  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)));
 
-  // 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));
-  }
+  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();
   std::unique_ptr<ui::DummyTextInputClient> client(
       new ui::DummyTextInputClient(ui::TEXT_INPUT_TYPE_TEXT));
   input_method->SetFocusedTextInputClient(client.get());
   ExtensionFunction::ScopedUserGestureForTests scoped_user_gesture;
   base::AutoReset<bool> auto_reset_disable_bubble(
       &InputImeActivateFunction::disable_bubble_for_testing_, true);
   SetTrackKeyEvents(input_method, true);
 
   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());
 }
 
 }  // namespace extensions