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

Side by Side Diff: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <queue> 5 #include <queue>
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 kTestAsGuestUser 231 kTestAsGuestUser
232 }; 232 };
233 233
234 class SpokenFeedbackTest 234 class SpokenFeedbackTest
235 : public LoggedInSpokenFeedbackTest, 235 : public LoggedInSpokenFeedbackTest,
236 public ::testing::WithParamInterface<SpokenFeedbackTestVariant> { 236 public ::testing::WithParamInterface<SpokenFeedbackTestVariant> {
237 protected: 237 protected:
238 SpokenFeedbackTest() {} 238 SpokenFeedbackTest() {}
239 virtual ~SpokenFeedbackTest() {} 239 virtual ~SpokenFeedbackTest() {}
240 240
241 virtual void SetUpCommandLine(CommandLine* command_line) override { 241 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
242 if (GetParam() == kTestAsGuestUser) { 242 if (GetParam() == kTestAsGuestUser) {
243 command_line->AppendSwitch(chromeos::switches::kGuestSession); 243 command_line->AppendSwitch(chromeos::switches::kGuestSession);
244 command_line->AppendSwitch(::switches::kIncognito); 244 command_line->AppendSwitch(::switches::kIncognito);
245 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, 245 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
246 "user"); 246 "user");
247 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 247 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
248 chromeos::login::kGuestUserName); 248 chromeos::login::kGuestUserName);
249 } 249 }
250 } 250 }
251 }; 251 };
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 521
522 // 522 //
523 // Spoken feedback tests that run only in guest mode. 523 // Spoken feedback tests that run only in guest mode.
524 // 524 //
525 525
526 class GuestSpokenFeedbackTest : public LoggedInSpokenFeedbackTest { 526 class GuestSpokenFeedbackTest : public LoggedInSpokenFeedbackTest {
527 protected: 527 protected:
528 GuestSpokenFeedbackTest() {} 528 GuestSpokenFeedbackTest() {}
529 virtual ~GuestSpokenFeedbackTest() {} 529 virtual ~GuestSpokenFeedbackTest() {}
530 530
531 virtual void SetUpCommandLine(CommandLine* command_line) override { 531 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
532 command_line->AppendSwitch(chromeos::switches::kGuestSession); 532 command_line->AppendSwitch(chromeos::switches::kGuestSession);
533 command_line->AppendSwitch(::switches::kIncognito); 533 command_line->AppendSwitch(::switches::kIncognito);
534 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 534 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
535 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser, 535 command_line->AppendSwitchASCII(chromeos::switches::kLoginUser,
536 chromeos::login::kGuestUserName); 536 chromeos::login::kGuestUserName);
537 } 537 }
538 538
539 private: 539 private:
540 DISALLOW_COPY_AND_ASSIGN(GuestSpokenFeedbackTest); 540 DISALLOW_COPY_AND_ASSIGN(GuestSpokenFeedbackTest);
541 }; 541 };
(...skipping 10 matching lines...) Expand all
552 552
553 // 553 //
554 // Spoken feedback tests of the out-of-box experience. 554 // Spoken feedback tests of the out-of-box experience.
555 // 555 //
556 556
557 class OobeSpokenFeedbackTest : public InProcessBrowserTest { 557 class OobeSpokenFeedbackTest : public InProcessBrowserTest {
558 protected: 558 protected:
559 OobeSpokenFeedbackTest() {} 559 OobeSpokenFeedbackTest() {}
560 virtual ~OobeSpokenFeedbackTest() {} 560 virtual ~OobeSpokenFeedbackTest() {}
561 561
562 virtual void SetUpCommandLine(CommandLine* command_line) override { 562 virtual void SetUpCommandLine(base::CommandLine* command_line) override {
563 command_line->AppendSwitch(chromeos::switches::kLoginManager); 563 command_line->AppendSwitch(chromeos::switches::kLoginManager);
564 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 564 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
565 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 565 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
566 } 566 }
567 567
568 virtual void SetUpOnMainThread() override { 568 virtual void SetUpOnMainThread() override {
569 AccessibilityManager::Get()-> 569 AccessibilityManager::Get()->
570 SetProfileForTest(ProfileHelper::GetSigninProfile()); 570 SetProfileForTest(ProfileHelper::GetSigninProfile());
571 } 571 }
572 572
(...skipping 21 matching lines...) Expand all
594 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); 594 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());
595 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), 595 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
596 "Combo box * of *")); 596 "Combo box * of *"));
597 ASSERT_TRUE( 597 ASSERT_TRUE(
598 ui_test_utils::SendKeyPressToWindowSync( 598 ui_test_utils::SendKeyPressToWindowSync(
599 window, ui::VKEY_TAB, false, false, false, false)); 599 window, ui::VKEY_TAB, false, false, false, false));
600 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance()); 600 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance());
601 } 601 }
602 602
603 } // namespace chromeos 603 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698