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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_util_unittest.cc

Issue 10388181: Remove virtual keyboard support from input_method_descriptor.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 27 matching lines...) Expand all
38 } // namespace 38 } // namespace
39 39
40 class InputMethodUtilTest : public testing::Test { 40 class InputMethodUtilTest : public testing::Test {
41 public: 41 public:
42 InputMethodUtilTest() : util_(whitelist_.GetSupportedInputMethods()) { 42 InputMethodUtilTest() : util_(whitelist_.GetSupportedInputMethods()) {
43 } 43 }
44 44
45 InputMethodDescriptor GetDesc(const std::string& id, 45 InputMethodDescriptor GetDesc(const std::string& id,
46 const std::string& raw_layout, 46 const std::string& raw_layout,
47 const std::string& language_code) { 47 const std::string& language_code) {
48 return InputMethodDescriptor(whitelist_, 48 return InputMethodDescriptor(id,
49 id,
50 "", 49 "",
51 raw_layout, 50 raw_layout,
52 language_code); 51 language_code);
53 } 52 }
54 53
55 InputMethodWhitelist whitelist_; 54 InputMethodWhitelist whitelist_;
56 TestableInputMethodUtil util_; 55 TestableInputMethodUtil util_;
57 }; 56 };
58 57
59 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) { 58 TEST_F(InputMethodUtilTest, GetInputMethodShortNameTest) {
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 EXPECT_FALSE(display_name.empty()) 520 EXPECT_FALSE(display_name.empty())
522 << "Invalid language code " << language_code; 521 << "Invalid language code " << language_code;
523 // On error, GetDisplayNameForLocale() returns the |language_code| as-is. 522 // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
524 EXPECT_NE(language_code, UTF16ToUTF8(display_name)) 523 EXPECT_NE(language_code, UTF16ToUTF8(display_name))
525 << "Invalid language code " << language_code; 524 << "Invalid language code " << language_code;
526 } 525 }
527 } 526 }
528 527
529 } // namespace input_method 528 } // namespace input_method
530 } // namespace chromeos 529 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698