Removes TextInputFocusManager.

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

 // Copyright (c) 2013 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 "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/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/browser/ui/views/toolbar/toolbar_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 "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"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/textfield/textfield_test_api.h"
+#include "ui/views/ime/input_method.h"
 
 namespace {
 
 void SetClipboardText(ui::ClipboardType type, const std::string& text) {
   ui::ScopedClipboardWriter(type).WriteText(base::ASCIIToUTF16(text));
 }
 
 }  // namespace
 
 class OmniboxViewViewsTest : public InProcessBrowserTest {
@@ skipping 329 matching lines @@
   EXPECT_TRUE(textfield_test_api.touch_selection_controller());
 
   // Execute a command and check if it deactivate touch editing. Paste & Go is
   // chosen since it is specific to Omnibox and its execution wouldn't be
   // delgated to the base Textfield class.
   omnibox_view_views->ExecuteCommand(IDS_PASTE_AND_GO, ui::EF_NONE);
   EXPECT_FALSE(textfield_test_api.touch_selection_controller());
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) {
-  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());
+  views::InputMethod* input_method =
+      omnibox_view_views->GetWidget()->GetInputMethod();
+  EXPECT_EQ(omnibox_view_views, input_method->GetTextInputClient());

[Yuki, 2015/06/15 06:14:30]

nit: better explicitly write as:
  omnibox_view_views->GetTextInputClient()

IIRC, OmniboxViewViews inherits TextInputClient directly, but it seems
implementation-based decision rather than design decision.  Considering their
nature, OmniboxViewViews is views:View, and not necessarily be TextInputClient
itself.

[Shu Chen, 2015/06/15 06:24:35]

Done.

 }