Removes TextInputFocusManager.

chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
index 592bd3d75089b85a486fe7288cb907d4ce5800e5..bf049af00d5914d7074ac91e55c0e0d1ff064d54 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc
@@ -20,7 +20,6 @@
 #include "chrome/test/base/interactive_test_utils.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/events/event_processor.h"
@@ -375,19 +374,3 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest,
   EXPECT_FALSE(textfield_test_api.touch_selection_controller());
 }
 
-IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) {

[Yuki, 2015/06/15 04:34:29]

I think we want to pass this test regardless of what the code we're running.
Please remove only the hack for TestInputFocusManager, and try to pass the test
to confirm that Omnibox gets focused in terms of text input.

[Shu Chen, 2015/06/15 05:06:49]

Done.

-  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  cmd_line->AppendSwitch(switches::kEnableTextInputFocusManager);
-
-  // TODO(yukishiino): The following call to FocusLocationBar is not necessary
-  // if the flag is enabled by default.  Remove the call once the transition to
-  // TextInputFocusManager completes.
-  chrome::FocusLocationBar(browser());
-  OmniboxView* view = NULL;
-  ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view));
-  OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view);
-  ui::TextInputFocusManager* text_input_focus_manager =
-      ui::TextInputFocusManager::GetInstance();
-  EXPECT_EQ(omnibox_view_views->GetTextInputClient(),
-            text_input_focus_manager->GetFocusedTextInputClient());
-}