| Index: chrome/browser/chromeos/input_method/ibus_ui_controller_unittest.cc
|
| diff --git a/chrome/browser/chromeos/input_method/ibus_ui_controller_unittest.cc b/chrome/browser/chromeos/input_method/ibus_ui_controller_unittest.cc
|
| index 04b355e7bf9bbf6bab06a73c157743684e513ab5..b80ea227a1794542b091196b2782cc9da1f81e2d 100644
|
| --- a/chrome/browser/chromeos/input_method/ibus_ui_controller_unittest.cc
|
| +++ b/chrome/browser/chromeos/input_method/ibus_ui_controller_unittest.cc
|
| @@ -5,7 +5,6 @@
|
| #include "base/logging.h"
|
| #include "chrome/browser/chromeos/input_method/ibus_ui_controller.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 {
|
| @@ -14,15 +13,13 @@ namespace input_method {
|
| // TODO(nona): Add more tests (crosbug.com/26334).
|
|
|
| TEST(IBusUiControllerTest, TestIsActive) {
|
| - InputMethodWhitelist w;
|
| InputMethodDescriptors descriptors;
|
| EXPECT_FALSE(IsActiveForTesting("mozc", &descriptors));
|
| - descriptors.push_back(
|
| - InputMethodDescriptor(w, "mozc", "name", "us", "en-US"));
|
| + descriptors.push_back(InputMethodDescriptor("mozc", "name", "us", "en-US"));
|
| EXPECT_TRUE(IsActiveForTesting("mozc", &descriptors));
|
| EXPECT_FALSE(IsActiveForTesting("mozc-jp", &descriptors));
|
| descriptors.push_back(
|
| - InputMethodDescriptor(w, "xkb:us::eng", "name", "us", "en-US"));
|
| + InputMethodDescriptor("xkb:us::eng", "name", "us", "en-US"));
|
| EXPECT_TRUE(IsActiveForTesting("xkb:us::eng", &descriptors));
|
| EXPECT_TRUE(IsActiveForTesting("mozc", &descriptors));
|
| EXPECT_FALSE(IsActiveForTesting("mozc-jp", &descriptors));
|
|
|