Remove virtual keyboard support from input_method_descriptor.h.

chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc

Index: chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc b/chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc
index 14f8b3e3a1ec2007d497260ead99dda7c5e88353..b7ad6eb1208c606a662308c83d88af54d2234d23 100644
--- a/chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_descriptor_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/input_method/input_method_descriptor.h"
-#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -20,45 +19,16 @@ class InputMethodDescriptorTest : public testing::Test {
   }
 
  protected:
-  InputMethodDescriptor GetDesc(const std::string& raw_layout) {
-    return InputMethodDescriptor(whitelist_,
-                                 "id",
-                                 "",  // name
-                                 raw_layout,
-                                 "language_code");
-  }
-
   InputMethodDescriptor GetDescById(const std::string& id) {
-    return InputMethodDescriptor(whitelist_,
-                                 id,
+    return InputMethodDescriptor(id,
                                  "",  // name
                                  "us",
                                  "language_code");
   }
-
- private:
-  const InputMethodWhitelist whitelist_;
 };
 
 }  // namespace
 
-TEST_F(InputMethodDescriptorTest, TestCreateInputMethodDescriptor) {
-  EXPECT_EQ("us", GetDesc("us").keyboard_layout());
-  EXPECT_EQ("us", GetDesc("us,us(dvorak)").keyboard_layout());
-  EXPECT_EQ("us(dvorak)", GetDesc("us(dvorak),us").keyboard_layout());
-
-  EXPECT_EQ("fr", GetDesc("fr").keyboard_layout());
-  EXPECT_EQ("fr", GetDesc("fr,us(dvorak)").keyboard_layout());
-  EXPECT_EQ("us(dvorak)", GetDesc("us(dvorak),fr").keyboard_layout());
-
-  EXPECT_EQ("fr", GetDesc("not-supported,fr").keyboard_layout());
-  EXPECT_EQ("fr", GetDesc("fr,not-supported").keyboard_layout());
-
-  EXPECT_EQ(kFallbackLayout, GetDesc("not-supported").keyboard_layout());
-  EXPECT_EQ(kFallbackLayout, GetDesc(",").keyboard_layout());
-  EXPECT_EQ(kFallbackLayout, GetDesc("").keyboard_layout());
-}
-
 TEST_F(InputMethodDescriptorTest, TestOperatorEqual) {
   EXPECT_EQ(GetDescById("xkb:us::eng"), GetDescById("xkb:us::eng"));
   EXPECT_NE(GetDescById("xkb:us::eng"), GetDescById("xkb:us:dvorak:eng"));