Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1545)

Unified Diff: chrome/browser/chromeos/login/oobe_localization_browsertest.cc

Issue 309623005: Remove the flag g_use_wrapped_extension_keyboard_layouts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/oobe_localization_browsertest.cc
diff --git a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
index c9007ebf7a7b3e3a08415359f3fb3edddde3d8e6..f6802185e5dcb16e6baeb900b2a61708f5bce12c 100644
--- a/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
+++ b/chrome/browser/chromeos/login/oobe_localization_browsertest.cc
@@ -223,14 +223,12 @@ std::string OobeLocalizationTest::DumpOptions(const char* select_id) {
std::string TranslateXKB2Extension(const std::string& src) {
std::string result(src);
- if (!extension_ime_util::UseWrappedExtensionKeyboardLayouts())
- return result;
// Modifies the expected keyboard select control options for the new
// extension based xkb id.
size_t pos = 0;
std::string repl_old = "xkb:";
std::string repl_new =
- extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:");
+ extension_ime_util::GetInputMethodIDByEngineID("xkb:");
while ((pos = result.find(repl_old, pos)) != std::string::npos) {
result.replace(pos, repl_old.length(), repl_new);
pos += repl_new.length();
@@ -285,7 +283,7 @@ void OobeLocalizationTest::RunLocalizationTest(
// Make sure we have a fallback keyboard.
if (!VerifyOptionExists(kKeyboardSelect,
- extension_ime_util::GetInputMethodIDByKeyboardLayout(
+ extension_ime_util::GetInputMethodIDByEngineID(
kUSLayout).c_str())) {
LOG(ERROR) << "Actual value of " << kKeyboardSelect << ":\n"
<< DumpOptions(kKeyboardSelect);

Powered by Google App Engine
This is Rietveld 408576698