Move DummyInputMethod into ui/base/ime/

This patch set moves dummy_input_method.h/cc into ui/base/ime/
so that refactoring of IME interface can be done more easily.

BUG=246534

Review URL: https://chromiumcodereview.appspot.com/16024014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205763 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 15 deletions

diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 7e6a867..0cd0704 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -15,7 +15,7 @@
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_stacking_client.h"
-#include "ui/base/test/dummy_input_method.h"
+#include "ui/base/ime/dummy_input_method.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/screen.h"
@@ -62,7 +62,7 @@ void AuraTestHelper::SetUp() {
   test_activation_client_.reset(
       new test::TestActivationClient(root_window_.get()));
   capture_client_.reset(new client::DefaultCaptureClient(root_window_.get()));
-  test_input_method_.reset(new ui::test::DummyInputMethod);
+  test_input_method_.reset(new ui::DummyInputMethod);
   root_window_->SetProperty(
       client::kRootWindowInputMethodKey,
       test_input_method_.get());
diff --git a/ui/base/test/dummy_input_method.cc b/ui/base/ime/dummy_input_method.cc
index 8a4a61f..b7bfd56 100644
--- a/ui/base/test/dummy_input_method.cc
+++ b/ui/base/ime/dummy_input_method.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/test/dummy_input_method.h"
+#include "ui/base/ime/dummy_input_method.h"
 
 namespace ui {
-namespace test {
 
 DummyInputMethod::DummyInputMethod() {
 }
@@ -75,6 +74,5 @@ void DummyInputMethod::AddObserver(InputMethodObserver* observer) {
 void DummyInputMethod::RemoveObserver(InputMethodObserver* observer) {
 }
 
-}  // namespace test
 }  // namespace ui
 
diff --git a/ui/base/test/dummy_input_method.h b/ui/base/ime/dummy_input_method.h
index 8d3b91e..3c1598c 100644
--- a/ui/base/test/dummy_input_method.h
+++ b/ui/base/ime/dummy_input_method.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_BASE_TEST_DUMMY_INPUT_METHOD_H_
-#define UI_BASE_TEST_DUMMY_INPUT_METHOD_H_
+#ifndef UI_BASE_IME_DUMMY_INPUT_METHOD_H_
+#define UI_BASE_IME_DUMMY_INPUT_METHOD_H_
 
 #include "ui/base/ime/input_method.h"
 
@@ -11,8 +11,6 @@ namespace ui {
 
 class InputMethodObserver;
 
-namespace test {
-
 class DummyInputMethod : public InputMethod {
  public:
   DummyInputMethod();
@@ -43,8 +41,7 @@ class DummyInputMethod : public InputMethod {
   DISALLOW_COPY_AND_ASSIGN(DummyInputMethod);
 };
 
-}  // namespace test
 }  // namespace ui
 
-#endif  // UI_BASE_TEST_DUMMY_INPUT_METHOD_H_
+#endif  // UI_BASE_IME_DUMMY_INPUT_METHOD_H_
 
diff --git a/ui/base/ime/ime_test_support.gypi b/ui/base/ime/ime_test_support.gypi
index f99d166..4ee1300 100644
--- a/ui/base/ime/ime_test_support.gypi
+++ b/ui/base/ime/ime_test_support.gypi
@@ -4,6 +4,8 @@
 
 {
   'sources': [
+    'dummy_input_method.cc',
+    'dummy_input_method.h',
     'text_input_test_support.cc',
     'text_input_test_support.h',
     'win/mock_tsf_bridge.cc',
diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi
index 2d1e78c..4ddd7b0 100644
--- a/ui/ui_unittests.gypi
+++ b/ui/ui_unittests.gypi
@@ -17,8 +17,6 @@
         'base/test/cocoa_test_event_utils.mm',
         'base/test/ui_cocoa_test_helper.h',
         'base/test/ui_cocoa_test_helper.mm',
-        'base/test/dummy_input_method.cc',
-        'base/test/dummy_input_method.h',
         'base/test/ui_controls.h',
         'base/test/ui_controls_aura.cc',
         'base/test/ui_controls_gtk.cc',