Refactoring the ownership of ui::InputMethod.

ash/wm/window_manager_unittest.cc

Index: ash/wm/window_manager_unittest.cc
diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
index 4c0552d53155fa88530af23c083a00b42d62dc54..79088290bc80ef96c16e93dbb913513c1e9f46be 100644
--- a/ash/wm/window_manager_unittest.cc
+++ b/ash/wm/window_manager_unittest.cc
@@ -23,7 +23,6 @@
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/screen.h"
 #include "ui/wm/core/compound_event_filter.h"
-#include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/public/activation_client.h"
 #include "ui/wm/public/activation_delegate.h"
 
@@ -137,8 +136,6 @@ TEST_F(WindowManagerTest, Focus) {
   // The IME event filter interferes with the basic key event propagation we

[James Cook, 2015/06/01 22:21:00]

Remove this comment.

[Shu Chen, 2015/06/02 04:11:16]

Done.

   // attempt to do here, so we remove it.
   test::ShellTestApi shell_test(Shell::GetInstance());

[James Cook, 2015/06/01 22:21:00]

Do you still need this variable?

[Shu Chen, 2015/06/02 04:11:16]

Done.

-  Shell::GetInstance()->RemovePreTargetHandler(
-      shell_test.input_method_event_filter());
 
   aura::Window* root_window = Shell::GetPrimaryRootWindow();
   root_window->SetBounds(gfx::Rect(0, 0, 510, 510));
@@ -654,8 +651,6 @@ TEST_F(WindowManagerTest, AdditionalFilters) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we remove it.
   test::ShellTestApi shell_test(Shell::GetInstance());

[James Cook, 2015/06/01 22:21:00]

same comments

[Shu Chen, 2015/06/02 04:11:16]

Done.

-  Shell::GetInstance()->RemovePreTargetHandler(
-      shell_test.input_method_event_filter());
 
   aura::Window* root_window = Shell::GetPrimaryRootWindow();