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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/browser_shutdown.h" 7 #include "chrome/browser/browser_shutdown.h"
8 #include "chrome/browser/chromeos/cros/cros_library.h" 8 #include "chrome/browser/chromeos/cros/cros_library.h"
9 #include "chrome/browser/chromeos/cros/network_library.h" 9 #include "chrome/browser/chromeos/cros/network_library.h"
10 #include "chrome/browser/chromeos/login/base_login_display_host.h" 10 #include "chrome/browser/chromeos/login/base_login_display_host.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) { 77 IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
78 ASSERT_TRUE(WizardController::default_controller() != NULL); 78 ASSERT_TRUE(WizardController::default_controller() != NULL);
79 WizardController::default_controller()->AdvanceToScreen( 79 WizardController::default_controller()->AdvanceToScreen(
80 WizardController::kNetworkScreenName); 80 WizardController::kNetworkScreenName);
81 81
82 // Checking the default locale. Provided that the profile is cleared in SetUp. 82 // Checking the default locale. Provided that the profile is cleared in SetUp.
83 EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale()); 83 EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale());
84 EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage()); 84 EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage());
85 EXPECT_FALSE(base::i18n::IsRTL()); 85 EXPECT_FALSE(base::i18n::IsRTL());
86 const std::wstring en_str = 86 const std::wstring en_str =
87 UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 87 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
88 88
89 LanguageSwitchMenu::SwitchLanguage("fr"); 89 LanguageSwitchMenu::SwitchLanguage("fr");
90 EXPECT_EQ("fr", g_browser_process->GetApplicationLocale()); 90 EXPECT_EQ("fr", g_browser_process->GetApplicationLocale());
91 EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage()); 91 EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
92 EXPECT_FALSE(base::i18n::IsRTL()); 92 EXPECT_FALSE(base::i18n::IsRTL());
93 const std::wstring fr_str = 93 const std::wstring fr_str =
94 UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 94 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
95 95
96 EXPECT_NE(en_str, fr_str); 96 EXPECT_NE(en_str, fr_str);
97 97
98 LanguageSwitchMenu::SwitchLanguage("ar"); 98 LanguageSwitchMenu::SwitchLanguage("ar");
99 EXPECT_EQ("ar", g_browser_process->GetApplicationLocale()); 99 EXPECT_EQ("ar", g_browser_process->GetApplicationLocale());
100 EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage()); 100 EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage());
101 EXPECT_TRUE(base::i18n::IsRTL()); 101 EXPECT_TRUE(base::i18n::IsRTL());
102 const std::wstring ar_str = 102 const std::wstring ar_str =
103 UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 103 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
104 104
105 EXPECT_NE(fr_str, ar_str); 105 EXPECT_NE(fr_str, ar_str);
106 } 106 }
107 107
108 class WizardControllerFlowTest : public WizardControllerTest { 108 class WizardControllerFlowTest : public WizardControllerTest {
109 protected: 109 protected:
110 WizardControllerFlowTest() {} 110 WizardControllerFlowTest() {}
111 // Overriden from InProcessBrowserTest: 111 // Overriden from InProcessBrowserTest:
112 virtual void SetUpOnMainThread() OVERRIDE { 112 virtual void SetUpOnMainThread() OVERRIDE {
113 WizardControllerTest::SetUpOnMainThread(); 113 WizardControllerTest::SetUpOnMainThread();
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 } 348 }
349 349
350 // TODO(dzhioev): Add test emaulating device with wrong HWID. 350 // TODO(dzhioev): Add test emaulating device with wrong HWID.
351 351
352 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 352 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
353 353
354 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, 354 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15,
355 add_tests_for_new_control_flow_you_just_introduced); 355 add_tests_for_new_control_flow_you_just_introduced);
356 356
357 } // namespace chromeos 357 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/version_info_updater.cc ('k') | chrome/browser/crash_upload_list_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698