Remove includes of "third_party/cros/chromeos_input_method.h"

BUG=chromium-os:16238
TEST=build chrome locally

Review URL: http://codereview.chromium.org/7172009

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

3 files changed, 17 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc b/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
index f971f64..ffea1ac 100644
--- a/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
+++ b/chrome/browser/chromeos/input_method/ibus_controller_unittest.cc
@@ -1,17 +1,15 @@
-// Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-// How to run the test:
-//   $ FEATURES="test" emerge-x86-generic -a libcros
-
-#include "chromeos_input_method.h"
-
-#include <gtest/gtest.h>
+#include "chrome/browser/chromeos/input_method/ibus_controller.h"
 
 #include "base/logging.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
+namespace input_method {
+
 namespace {
 InputMethodDescriptor GetDesc(const std::string& raw_layout) {
   return CreateInputMethodDescriptor(
@@ -20,7 +18,9 @@ InputMethodDescriptor GetDesc(const std::string& raw_layout) {
 }  // namespace
 
 // Tests InputMethodIdIsWhitelisted function.
-TEST(ChromeOSInputMethodTest, TestInputMethodIdIsWhitelisted) {
+// TODO(satorux): Enable this test once InputMethodIdIsWhitelisted() is
+// functional outside the chroot.
+TEST(IBusControllerTest, DISABLED_TestInputMethodIdIsWhitelisted) {
   EXPECT_TRUE(InputMethodIdIsWhitelisted("mozc"));
   EXPECT_TRUE(InputMethodIdIsWhitelisted("xkb:us:dvorak:eng"));
   EXPECT_FALSE(InputMethodIdIsWhitelisted("mozc,"));
@@ -31,7 +31,9 @@ TEST(ChromeOSInputMethodTest, TestInputMethodIdIsWhitelisted) {
 }
 
 // Tests XkbLayoutIsSupported function.
-TEST(ChromeOSInputMethodTest, TestXkbLayoutIsSupported) {
+// TODO(satorux): Enable this test once XkbLayoutIsSupported() is
+// functional outside the chroot.
+TEST(IBusControllerTest, DISABLED_TestXkbLayoutIsSupported) {
   EXPECT_TRUE(XkbLayoutIsSupported("us"));
   EXPECT_TRUE(XkbLayoutIsSupported("us(dvorak)"));
   EXPECT_TRUE(XkbLayoutIsSupported("fr"));
@@ -44,7 +46,9 @@ TEST(ChromeOSInputMethodTest, TestXkbLayoutIsSupported) {
 }
 
 // Tests CreateInputMethodDescriptor function.
-TEST(ChromeOSInputMethodTest, TestCreateInputMethodDescriptor) {
+// TODO(satorux): Enable this test once CreateInputMethodDescriptor() is
+// functional outside the chroot.
+TEST(IBusControllerTest, DISABLED_TestCreateInputMethodDescriptor) {
   EXPECT_EQ(GetDesc("us").keyboard_layout, "us");
   EXPECT_EQ(GetDesc("us,us(dvorak)").keyboard_layout, "us");
   EXPECT_EQ(GetDesc("us(dvorak),us").keyboard_layout, "us(dvorak)");
@@ -64,4 +68,5 @@ TEST(ChromeOSInputMethodTest, TestCreateInputMethodDescriptor) {
   // TODO(yusukes): Add tests for |virtual_keyboard_layout| member.
 }
 
-}
+}  // namespace input_method
+}  // namespace chromeos
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 88c857a..e07f36c 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -21,7 +21,6 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
-#include "third_party/cros/chromeos_input_method.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0fe840d..2367414 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1311,6 +1311,7 @@
         'browser/chromeos/customization_document_unittest.cc',
         'browser/chromeos/external_metrics_unittest.cc',
         'browser/chromeos/gview_request_interceptor_unittest.cc',
+        'browser/chromeos/input_method/ibus_controller_unittest.cc',
         'browser/chromeos/input_method/input_method_util_unittest.cc',
         'browser/chromeos/input_method/virtual_keyboard_selector_unittest.cc',
         'browser/chromeos/input_method/xkeyboard_unittest.cc',