Override keyset with the IME layout info.

chrome/browser/chromeos/input_method/input_method_manager_impl_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/chromeos/input_method/input_method_manager_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 1392 matching lines @@
   manager_->MigrateInputMethods(&input_method_ids);
 
   ASSERT_EQ(4U, input_method_ids.size());
 
   EXPECT_EQ(ImeIdFromEngineId("xkb:us::eng"), input_method_ids[0]);
   EXPECT_EQ(ImeIdFromEngineId("xkb:fr::fra"), input_method_ids[1]);
   EXPECT_EQ("_comp_ime_asdf_pinyin", input_method_ids[2]);
   EXPECT_EQ(ImeIdFromEngineId("zh-t-i0-pinyin"), input_method_ids[3]);
 }
 
-TEST_F(InputMethodManagerImplTest, OverrideKeyboardUrlRefWithEmojiOrHwt) {
+TEST_F(InputMethodManagerImplTest, OverrideKeyboardUrlRefWithKeyset) {
   const GURL inputview_url(
       "chrome-extension://"
       "inputview.html#id=us.compact.qwerty&language=en-US&passwordLayout=us."
       "compact.qwerty&name=keyboard_us");
   keyboard::SetOverrideContentUrl(inputview_url);
   EXPECT_EQ(inputview_url, keyboard::GetOverrideContentUrl());
 
   // Override the keyboard url ref with 'emoji'.
   const GURL overridden_url_emoji(
       "chrome-extension://"
-      "inputview.html#id=emoji&language=en-US&passwordLayout=us."
-      "compact.qwerty&name=keyboard_us");
+      "inputview.html#id=us.compact.qwerty.emoji&language=en-US&passwordLayout="
+      "us.compact.qwerty&name=keyboard_us");
   manager_->OverrideKeyboardUrlRef("emoji");
   EXPECT_EQ(overridden_url_emoji, keyboard::GetOverrideContentUrl());
 
   // Override the keyboard url ref with 'hwt'.
+  keyboard::SetOverrideContentUrl(inputview_url);
   const GURL overridden_url_hwt(
       "chrome-extension://"
-      "inputview.html#id=hwt&language=en-US&passwordLayout=us."
-      "compact.qwerty&name=keyboard_us");
+      "inputview.html#id=us.compact.qwerty.hwt&language=en-US&passwordLayout="
+      "us.compact.qwerty&name=keyboard_us");
   manager_->OverrideKeyboardUrlRef("hwt");
   EXPECT_EQ(overridden_url_hwt, keyboard::GetOverrideContentUrl());
-}
-
-TEST_F(InputMethodManagerImplTest, OverrideKeyboardUrlRefWithVoice) {
-  const GURL inputview_url(
-      "chrome-extension://"
-      "inputview.html#id=us.compact.qwerty&language=en-US&passwordLayout=us."
-      "compact.qwerty&name=keyboard_us");
-  keyboard::SetOverrideContentUrl(inputview_url);
-  EXPECT_EQ(inputview_url, keyboard::GetOverrideContentUrl());
 
   // Override the keyboard url ref with 'voice'.
+  keyboard::SetOverrideContentUrl(inputview_url);
   const GURL overridden_url_voice(
       "chrome-extension://"
       "inputview.html#id=us.compact.qwerty.voice&language=en-US"
       "&passwordLayout=us.compact.qwerty&name=keyboard_us");
   manager_->OverrideKeyboardUrlRef("voice");
   EXPECT_EQ(overridden_url_voice, keyboard::GetOverrideContentUrl());
 }
 
 TEST_F(InputMethodManagerImplTest, OverrideDefaultKeyboardUrlRef) {
   const GURL default_url("chrome://inputview.html");
   keyboard::SetOverrideContentUrl(default_url);
 
   EXPECT_EQ(default_url, keyboard::GetOverrideContentUrl());
 
   manager_->OverrideKeyboardUrlRef("emoji");
   EXPECT_EQ(default_url, keyboard::GetOverrideContentUrl());
 }
 
 }  // namespace input_method
 }  // namespace chromeos