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

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

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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"
11 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 11 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
12 #include "chromeos/ime/input_method_whitelist.h" 12 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
13 #include "chromeos/ime/mock_input_method_delegate.h" 13 #include "chromeos/ime/mock_input_method_delegate.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 19
20 extern const char* kExtensionImePrefix; 20 extern const char* kExtensionImePrefix;
21 21
22 namespace input_method { 22 namespace input_method {
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 EXPECT_FALSE(display_name.empty()) 557 EXPECT_FALSE(display_name.empty())
558 << "Invalid language code " << language_code; 558 << "Invalid language code " << language_code;
559 // On error, GetDisplayNameForLocale() returns the |language_code| as-is. 559 // On error, GetDisplayNameForLocale() returns the |language_code| as-is.
560 EXPECT_NE(language_code, UTF16ToUTF8(display_name)) 560 EXPECT_NE(language_code, UTF16ToUTF8(display_name))
561 << "Invalid language code " << language_code; 561 << "Invalid language code " << language_code;
562 } 562 }
563 } 563 }
564 564
565 } // namespace input_method 565 } // namespace input_method
566 } // namespace chromeos 566 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698