| Index: chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
|
| index aa8506ca9a0853d659eac4353513527fc1e28ec7..87a4e30e99509197f6957b1e2289e2b184bc08f7 100644
|
| --- a/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
|
| +++ b/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
|
| #include "chrome/browser/extensions/api/test/test_api.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chromeos/ime/extension_ime_util.h"
|
| #include "chromeos/ime/input_method_manager.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| @@ -33,6 +34,8 @@ class SetInputMethodListener : public content::NotificationObserver {
|
| public:
|
| // Creates listener, which should reply exactly |count_| times.
|
| explicit SetInputMethodListener(int count) : count_(count) {
|
| + use_ext_xkb_flag_ = chromeos::extension_ime_util::
|
| + SetUseWrappedExtensionKeyboardLayoutsFlagForTesting(false);
|
| registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
|
| content::NotificationService::AllSources());
|
| std::vector<std::string> keyboard_layouts;
|
| @@ -42,6 +45,8 @@ class SetInputMethodListener : public content::NotificationObserver {
|
| }
|
|
|
| virtual ~SetInputMethodListener() {
|
| + chromeos::extension_ime_util::
|
| + SetUseWrappedExtensionKeyboardLayoutsFlagForTesting(use_ext_xkb_flag_);
|
| EXPECT_EQ(0, count_);
|
| }
|
|
|
| @@ -68,6 +73,7 @@ class SetInputMethodListener : public content::NotificationObserver {
|
| content::NotificationRegistrar registrar_;
|
|
|
| int count_;
|
| + bool use_ext_xkb_flag_;
|
| };
|
|
|
| class ExtensionInputMethodApiTest : public ExtensionApiTest {
|
|
|