Remove virtual keyboard support from input_method_descriptor.h.

chrome/browser/ui/webui/options2/language_options_handler2_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options2/language_options_handler2.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/input_method/input_method_descriptor.h"
-#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/ui/webui/options2/chromeos/cros_language_options_handler2.h"
 
 using chromeos::input_method::InputMethodDescriptor;
 using chromeos::input_method::InputMethodDescriptors;
 using chromeos::input_method::InputMethodManager;
-using chromeos::input_method::InputMethodWhitelist;
 using chromeos::input_method::MockInputMethodManager;
 
 namespace {
 
 class LanguageOptionsHandlerTest : public testing::Test {
  public:
   LanguageOptionsHandlerTest() {
     InputMethodManager::InitializeForTesting(new MockInputMethodManager);
   }
   virtual ~LanguageOptionsHandlerTest() {
     InputMethodManager::Shutdown();
   }
 
  protected:
   InputMethodDescriptors CreateInputMethodDescriptors() {
     InputMethodDescriptors descriptors;
     descriptors.push_back(GetDesc("xkb:us::eng", "us", "en-US"));
     descriptors.push_back(GetDesc("xkb:fr::fra", "fr", "fr"));
     descriptors.push_back(GetDesc("xkb:be::fra", "be", "fr"));
     descriptors.push_back(GetDesc("mozc", "us", "ja"));
     return descriptors;
   }
 
  private:
   InputMethodDescriptor GetDesc(const std::string& id,
                                 const std::string& raw_layout,
                                 const std::string& language_code) {
-    return InputMethodDescriptor(whitelist_,
-                                 id,
+    return InputMethodDescriptor(id,
                                  "",  // name
                                  raw_layout,
                                  language_code);
   }
-
-  const InputMethodWhitelist whitelist_;
 };
 
 }  // namespace
 #else
 typedef testing::Test LanguageOptionsHandlerTest;
 #endif
 
 #if defined(OS_CHROMEOS)
 TEST_F(LanguageOptionsHandlerTest, GetInputMethodList) {
   InputMethodDescriptors descriptors = CreateInputMethodDescriptors();
@@ skipping 154 matching lines @@
   // fail when we add support for the language.
   // EXPECT_FALSE(dictionary->HasKey("no"));
 }
 #endif  // !defined(OS_MACOSX)
 
 TEST_F(LanguageOptionsHandlerTest, GetSpellCheckLanguageCodeSet) {
   scoped_ptr<DictionaryValue> dictionary(
       options2::LanguageOptionsHandler::GetSpellCheckLanguageCodeSet());
   EXPECT_TRUE(dictionary->HasKey("en-US"));
 }