Removes TextInputFocusManager.

ui/base/ime/input_method_base_unittest.cc

 // Copyright 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 "ui/base/ime/input_method_base.h"
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/scoped_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/base/ime/input_method_observer.h"
-#include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 
 namespace ui {
 namespace {
 
 class ClientChangeVerifier {
  public:
   ClientChangeVerifier()
      : previous_client_(NULL),
@@ skipping 21 matching lines @@
     previous_client_ = previous_client;
     next_client_ = next_client;
     call_expected_ = true;
     on_will_change_focused_client_called_ = false;
     on_did_change_focused_client_called_ = false;
     on_text_input_state_changed_ = false;
   }
 
   // Verifies the result satisfies the expectation or not.
   void Verify() {
-    if (switches::IsTextInputFocusManagerEnabled()) {
-      EXPECT_FALSE(on_will_change_focused_client_called_);
-      EXPECT_FALSE(on_did_change_focused_client_called_);
-      EXPECT_FALSE(on_text_input_state_changed_);
-    } else {
-      EXPECT_EQ(call_expected_, on_will_change_focused_client_called_);
-      EXPECT_EQ(call_expected_, on_did_change_focused_client_called_);
-      EXPECT_EQ(call_expected_, on_text_input_state_changed_);
-    }
+    EXPECT_EQ(call_expected_, on_will_change_focused_client_called_);
+    EXPECT_EQ(call_expected_, on_did_change_focused_client_called_);
+    EXPECT_EQ(call_expected_, on_text_input_state_changed_);
   }
 
   void OnWillChangeFocusedClient(TextInputClient* focused_before,
                                  TextInputClient* focused) {
     EXPECT_TRUE(call_expected_);
 
     // Check arguments
     EXPECT_EQ(previous_client_, focused_before);
     EXPECT_EQ(next_client_, focused);
 
@@ skipping 120 matching lines @@
 
   ClientChangeVerifier* verifier_;
   DISALLOW_COPY_AND_ASSIGN(MockInputMethodObserver);
 };
 
 typedef ScopedObserver<InputMethod, InputMethodObserver>
     InputMethodScopedObserver;
 
 void SetFocusedTextInputClient(InputMethod* input_method,
                                TextInputClient* text_input_client) {
-  if (switches::IsTextInputFocusManagerEnabled()) {
-    TextInputFocusManager::GetInstance()->FocusTextInputClient(
-        text_input_client);
-  } else {
-    input_method->SetFocusedTextInputClient(text_input_client);
-  }
+  input_method->SetFocusedTextInputClient(text_input_client);
 }
 
 TEST_F(InputMethodBaseTest, SetFocusedTextInputClient) {
   DummyTextInputClient text_input_client_1st;
   DummyTextInputClient text_input_client_2nd;
 
   ClientChangeVerifier verifier;
   MockInputMethodBase input_method(&verifier);
   MockInputMethodObserver input_method_observer(&verifier);
   InputMethodScopedObserver scoped_observer(&input_method_observer);
@@ skipping 42 matching lines @@
 
   {
     SCOPED_TRACE("Redundant focus events must be ignored");
     verifier.ExpectClientDoesNotChange();
     SetFocusedTextInputClient(&input_method, NULL);
     verifier.Verify();
   }
 }
 
 TEST_F(InputMethodBaseTest, DetachTextInputClient) {
-  // DetachTextInputClient is not supported when IsTextInputFocusManagerEnabled.
-  if (switches::IsTextInputFocusManagerEnabled())
-    return;
-
   DummyTextInputClient text_input_client;
   DummyTextInputClient text_input_client_the_other;
 
   ClientChangeVerifier verifier;
   MockInputMethodBase input_method(&verifier);
   MockInputMethodObserver input_method_observer(&verifier);
   InputMethodScopedObserver scoped_observer(&input_method_observer);
   scoped_observer.Add(&input_method);
 
   // Assume that the top-level-widget gains focus.
@@ skipping 24 matching lines @@
     input_method.OnFocus();
     verifier.ExpectClientChange(&text_input_client, NULL);
     input_method.DetachTextInputClient(&text_input_client);
     EXPECT_EQ(NULL, input_method.GetTextInputClient());
     verifier.Verify();
   }
 }
 
 }  // namespace
 }  // namespace ui