OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 5 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) { | 45 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) { |
46 } | 46 } |
47 | 47 |
48 InputMethodDescriptor GetDesc(const std::string& id, | 48 InputMethodDescriptor GetDesc(const std::string& id, |
49 const std::string& raw_layout, | 49 const std::string& raw_layout, |
50 const std::string& language_code) { | 50 const std::string& language_code) { |
51 return InputMethodDescriptor(id, | 51 return InputMethodDescriptor(id, |
52 "", | 52 "", |
53 raw_layout, | 53 raw_layout, |
54 language_code, | 54 language_code, |
| 55 "", // options page url |
55 false); | 56 false); |
56 } | 57 } |
57 | 58 |
58 MockInputMethodDelegate delegate_; | 59 MockInputMethodDelegate delegate_; |
59 InputMethodWhitelist whitelist_; | 60 InputMethodWhitelist whitelist_; |
60 TestableInputMethodUtil util_; | 61 TestableInputMethodUtil util_; |
61 }; | 62 }; |
62 | 63 |
63 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) { | 64 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) { |
64 // Test normal cases. Two-letter language code should be returned. | 65 // Test normal cases. Two-letter language code should be returned. |
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 EXPECT_FALSE(display_name.empty()) | 551 EXPECT_FALSE(display_name.empty()) |
551 << "Invalid language code " << language_code; | 552 << "Invalid language code " << language_code; |
552 // On error, GetDisplayNameForLocale() returns the |language_code| as-is. | 553 // On error, GetDisplayNameForLocale() returns the |language_code| as-is. |
553 EXPECT_NE(language_code, UTF16ToUTF8(display_name)) | 554 EXPECT_NE(language_code, UTF16ToUTF8(display_name)) |
554 << "Invalid language code " << language_code; | 555 << "Invalid language code " << language_code; |
555 } | 556 } |
556 } | 557 } |
557 | 558 |
558 } // namespace input_method | 559 } // namespace input_method |
559 } // namespace chromeos | 560 } // namespace chromeos |
OLD | NEW |