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

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

Issue 299363002: Cleanup: Get rid of unneeded base::UTF16ToWide() conversions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style Created 6 years, 6 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
« no previous file with comments | « no previous file | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) { 277 IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
278 ASSERT_TRUE(WizardController::default_controller() != NULL); 278 ASSERT_TRUE(WizardController::default_controller() != NULL);
279 WizardController::default_controller()->AdvanceToScreen( 279 WizardController::default_controller()->AdvanceToScreen(
280 WizardController::kNetworkScreenName); 280 WizardController::kNetworkScreenName);
281 281
282 // Checking the default locale. Provided that the profile is cleared in SetUp. 282 // Checking the default locale. Provided that the profile is cleared in SetUp.
283 EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale()); 283 EXPECT_EQ("en-US", g_browser_process->GetApplicationLocale());
284 EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage()); 284 EXPECT_STREQ("en", icu::Locale::getDefault().getLanguage());
285 EXPECT_FALSE(base::i18n::IsRTL()); 285 EXPECT_FALSE(base::i18n::IsRTL());
286 const std::wstring en_str = 286 const base::string16 en_str =
287 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 287 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE);
288 288
289 RunSwitchLanguageTest("fr", "fr", true); 289 RunSwitchLanguageTest("fr", "fr", true);
290 EXPECT_EQ("fr", g_browser_process->GetApplicationLocale()); 290 EXPECT_EQ("fr", g_browser_process->GetApplicationLocale());
291 EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage()); 291 EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
292 EXPECT_FALSE(base::i18n::IsRTL()); 292 EXPECT_FALSE(base::i18n::IsRTL());
293 const std::wstring fr_str = 293 const base::string16 fr_str =
294 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 294 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE);
295 295
296 EXPECT_NE(en_str, fr_str); 296 EXPECT_NE(en_str, fr_str);
297 297
298 RunSwitchLanguageTest("ar", "ar", true); 298 RunSwitchLanguageTest("ar", "ar", true);
299 EXPECT_EQ("ar", g_browser_process->GetApplicationLocale()); 299 EXPECT_EQ("ar", g_browser_process->GetApplicationLocale());
300 EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage()); 300 EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage());
301 EXPECT_TRUE(base::i18n::IsRTL()); 301 EXPECT_TRUE(base::i18n::IsRTL());
302 const std::wstring ar_str = 302 const base::string16 ar_str =
303 base::UTF16ToWide(l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE)); 303 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE);
304 304
305 EXPECT_NE(fr_str, ar_str); 305 EXPECT_NE(fr_str, ar_str);
306 } 306 }
307 307
308 IN_PROC_BROWSER_TEST_F(WizardControllerTest, VolumeIsChangedForChromeVox) { 308 IN_PROC_BROWSER_TEST_F(WizardControllerTest, VolumeIsChangedForChromeVox) {
309 SetUpCrasAndEnableChromeVox(75 /* volume_percent */, true /* mute_on */); 309 SetUpCrasAndEnableChromeVox(75 /* volume_percent */, true /* mute_on */);
310 310
311 // Check that output is unmuted now and at some level. 311 // Check that output is unmuted now and at some level.
312 CrasAudioHandler* cras = CrasAudioHandler::Get(); 312 CrasAudioHandler* cras = CrasAudioHandler::Get();
313 ASSERT_FALSE(cras->IsOutputMuted()); 313 ASSERT_FALSE(cras->IsOutputMuted());
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 WizardController::default_controller()->GetEnrollmentScreen(); 933 WizardController::default_controller()->GetEnrollmentScreen();
934 EXPECT_EQ(screen, WizardController::default_controller()->current_screen()); 934 EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
935 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED); 935 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
936 936
937 EXPECT_TRUE(StartupUtils::IsOobeCompleted()); 937 EXPECT_TRUE(StartupUtils::IsOobeCompleted());
938 } 938 }
939 939
940 940
941 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest, 941 IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
942 ControlFlowEnrollmentBack) { 942 ControlFlowEnrollmentBack) {
943
944 EXPECT_CALL(*mock_enrollment_screen_->actor(), 943 EXPECT_CALL(*mock_enrollment_screen_->actor(),
945 SetParameters(mock_enrollment_screen_, 944 SetParameters(mock_enrollment_screen_,
946 EnrollmentScreenActor::ENROLLMENT_MODE_FORCED, 945 EnrollmentScreenActor::ENROLLMENT_MODE_FORCED,
947 "")) 946 ""))
948 .Times(1); 947 .Times(1);
949 948
950 EXPECT_TRUE(ExistingUserController::current_controller() == NULL); 949 EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
951 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(), 950 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
952 WizardController::default_controller()->current_screen()); 951 WizardController::default_controller()->current_screen());
953 EXPECT_CALL(*mock_network_screen_, Show()).Times(1); 952 EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 1058
1060 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 1059 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
1061 1060
1062 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1061 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1063 // UI and logic is ready. http://crbug.com/127016 1062 // UI and logic is ready. http://crbug.com/127016
1064 1063
1065 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21, 1064 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21,
1066 add_tests_for_new_control_flow_you_just_introduced); 1065 add_tests_for_new_control_flow_you_just_introduced);
1067 1066
1068 } // namespace chromeos 1067 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/jumplist_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698