Refactoring the ownership of ui::InputMethod.

ash/magnifier/magnification_controller_unittest.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 "ash/magnifier/magnification_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "base/strings/stringprintf.h"
-#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/test/aura_test_utils.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/chromeos/accessibility_types.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/fill_layout.h"
@@ skipping 120 matching lines @@
   void FocusOnTextInputView() {
     DCHECK(text_input_view_);
     text_input_view_->FocusOnTextInput();
   }
 
  private:
   TextInputView* text_input_view_;
 
   ui::InputMethod* GetInputMethod() {
     DCHECK(text_input_view_);
-    return text_input_view_->GetWidget()
-        ->GetNativeWindow()
-        ->GetRootWindow()
-        ->GetProperty(aura::client::kRootWindowInputMethodKey);
+    return text_input_view_->GetWidget()->GetHostInputMethod();
   }
 
   DISALLOW_COPY_AND_ASSIGN(MagnificationControllerTest);
 };
 
 TEST_F(MagnificationControllerTest, EnableAndDisable) {
   // Confirms the magnifier is disabled.
   EXPECT_TRUE(GetRootWindow()->layer()->transform().IsIdentity());
   EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
   EXPECT_EQ("0,0 800x600", GetViewport().ToString());
@@ skipping 535 matching lines @@
   UpdateDisplay("500x500");
   EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(2.0f, GetMagnificationController()->GetScale());
 
   GetMagnificationController()->SetEnabled(false);
   EXPECT_EQ("0,0 500x500", screen->GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
 }
 
 }  // namespace ash