Removes TextInputFocusManager.

ui/wm/core/focus_controller_unittest.cc

 // Copyright (c) 2012 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/wm/core/focus_controller.h"
 
 #include <map>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
-#include "ui/base/ime/dummy_text_input_client.h"
-#include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/core/wm_state.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_client.h"
 
@@ skipping 228 matching lines @@
     }
   }
 
  private:
   aura::Window* target_;
   aura::WindowTracker tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTargetFocusNotificationObserver);
 };
 
-class ScopedFocusedTextInputClientChanger
-    : public ScopedFocusNotificationObserver {
- public:
-  ScopedFocusedTextInputClientChanger(aura::Window* root_window,
-                                      ui::TextInputClient* text_input_client)
-      : ScopedFocusNotificationObserver(root_window),
-        text_input_client_(text_input_client) {}
-
- private:
-  // Overridden from aura::client::FocusChangeObserver:
-  void OnWindowFocused(aura::Window* gained_focus,
-                       aura::Window* lost_focus) override {
-    ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(
-        text_input_client_);
-  }
-
-  ui::TextInputClient* text_input_client_;
-};
-
 // Used to fake the handling of events in the pre-target phase.
 class SimpleEventHandler : public ui::EventHandler {
  public:
   SimpleEventHandler() {}
   ~SimpleEventHandler() override {}
 
   // Overridden from ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override { event->SetHandled(); }
   void OnGestureEvent(ui::GestureEvent* event) override { event->SetHandled(); }
 
@@ skipping 182 matching lines @@
   virtual void ShiftFocusToChildOfInactiveWindow() {}
   virtual void ShiftFocusToParentOfFocusedWindow() {}
   virtual void FocusRulesOverride() = 0;
   virtual void ActivationRulesOverride() = 0;
   virtual void ShiftFocusOnActivation() {}
   virtual void ShiftFocusOnActivationDueToHide() {}
   virtual void NoShiftActiveOnActivation() {}
   virtual void FocusChangeDuringDrag() {}
   virtual void ChangeFocusWhenNothingFocusedAndCaptured() {}
   virtual void DontPassDeletedWindow() {}
-  virtual void FocusedTextInputClient() {}
 
  private:
   scoped_ptr<FocusController> focus_controller_;
   TestFocusRules* test_focus_rules_;
   scoped_ptr<wm::WMState> wm_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusControllerTestBase);
 };
 
 // Test base for tests where focus is directly set to a target window.
@@ skipping 351 matching lines @@
       FocusWindowById(3);
 
       EXPECT_EQ(3, GetActiveWindowId());
       EXPECT_EQ(3, GetFocusedWindowId());
 
       EXPECT_EQ(to_delete, observer1.GetDeletedWindow());
       EXPECT_FALSE(observer2.was_notified_with_deleted_window());
     }
   }
 
-  // Verifies if the focused text input client is cleared when a window gains
-  // or loses the focus.
-  void FocusedTextInputClient() override {
-    ui::TextInputFocusManager* text_input_focus_manager =
-        ui::TextInputFocusManager::GetInstance();
-    ui::DummyTextInputClient text_input_client;
-    ui::TextInputClient* null_text_input_client = NULL;
-
-    EXPECT_EQ(null_text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-
-    text_input_focus_manager->FocusTextInputClient(&text_input_client);
-    EXPECT_EQ(&text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-    FocusWindowById(1);
-    // The focused text input client gets cleared when a window gets focused
-    // unless any of observers sets the focused text input client.
-    EXPECT_EQ(null_text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-
-    ScopedFocusedTextInputClientChanger text_input_focus_changer(
-        root_window(), &text_input_client);
-    EXPECT_EQ(null_text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-    FocusWindowById(2);
-    // |text_input_focus_changer| sets the focused text input client.
-    EXPECT_EQ(&text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-
-    FocusWindow(NULL);
-    // The focused text input client gets cleared when a window loses the focus.
-    EXPECT_EQ(null_text_input_client,
-              text_input_focus_manager->GetFocusedTextInputClient());
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(FocusControllerDirectTestBase);
 };
 
 // Focus and Activation changes via aura::client::ActivationClient API.
 class FocusControllerApiTest : public FocusControllerDirectTestBase {
  public:
   FocusControllerApiTest() {}
 
  private:
@@ skipping 431 matching lines @@
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
                       ChangeFocusWhenNothingFocusedAndCaptured);
 
 // See description above DontPassDeletedWindow() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow);
 
 // See description above TransientChildWindowActivationTest() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerParentHideTest,
                       TransientChildWindowActivationTest);
 
-// - Verifies that the focused text input client is cleard when the window focus
-//   changes.
-ALL_FOCUS_TESTS(FocusedTextInputClient);
-
 // If a mouse event was handled, it should not activate a window.
 FOCUS_CONTROLLER_TEST(FocusControllerMouseEventTest, IgnoreHandledEvent);
 
 }  // namespace wm