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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h Created 6 years, 2 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
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/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 class InputMethodUtilTest : public testing::Test { 46 class InputMethodUtilTest : public testing::Test {
47 public: 47 public:
48 InputMethodUtilTest() 48 InputMethodUtilTest()
49 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) { 49 : util_(&delegate_, whitelist_.GetSupportedInputMethods()) {
50 delegate_.set_get_localized_string_callback( 50 delegate_.set_get_localized_string_callback(
51 base::Bind(&l10n_util::GetStringUTF16)); 51 base::Bind(&l10n_util::GetStringUTF16));
52 delegate_.set_get_display_language_name_callback( 52 delegate_.set_get_display_language_name_callback(
53 base::Bind(&InputMethodUtilTest::GetDisplayLanguageName)); 53 base::Bind(&InputMethodUtilTest::GetDisplayLanguageName));
54 } 54 }
55 55
56 virtual void SetUp() OVERRIDE { 56 virtual void SetUp() override {
57 InputMethodDescriptors input_methods; 57 InputMethodDescriptors input_methods;
58 58
59 std::vector<std::string> layouts; 59 std::vector<std::string> layouts;
60 std::vector<std::string> languages; 60 std::vector<std::string> languages;
61 layouts.push_back("us"); 61 layouts.push_back("us");
62 languages.push_back("zh-CN"); 62 languages.push_back("zh-CN");
63 63
64 InputMethodDescriptor pinyin_ime(Id(pinyin_ime_id), 64 InputMethodDescriptor pinyin_ime(Id(pinyin_ime_id),
65 "Pinyin input for testing", 65 "Pinyin input for testing",
66 "CN", 66 "CN",
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 EXPECT_EQ(arraysize(migration_cases), input_method_ids.size()); 476 EXPECT_EQ(arraysize(migration_cases), input_method_ids.size());
477 for (size_t i = 0; i < arraysize(migration_cases); ++i) { 477 for (size_t i = 0; i < arraysize(migration_cases); ++i) {
478 EXPECT_EQ( 478 EXPECT_EQ(
479 extension_ime_util::GetInputMethodIDByEngineID(migration_cases[i][1]), 479 extension_ime_util::GetInputMethodIDByEngineID(migration_cases[i][1]),
480 input_method_ids[i]); 480 input_method_ids[i]);
481 } 481 }
482 } 482 }
483 483
484 } // namespace input_method 484 } // namespace input_method
485 } // namespace chromeos 485 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698