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

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/login_browsertest.cc

Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos" (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 "ash/shell.h" 5 #include "ash/shell.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "chrome/browser/chrome_browser_main.h" 7 #include "chrome/browser/chrome_browser_main.h"
8 #include "chrome/browser/chrome_browser_main_extra_parts.h" 8 #include "chrome/browser/chrome_browser_main_extra_parts.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 10 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
11 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 11 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
12 #include "chrome/browser/chromeos/cros/mock_network_library.h" 12 #include "chrome/browser/chromeos/cros/mock_network_library.h"
13 #include "chrome/browser/chromeos/login/base_login_display_host.h" 13 #include "chrome/browser/chromeos/login/base_login_display_host.h"
14 #include "chrome/browser/chromeos/login/login_wizard.h" 14 #include "chrome/browser/chromeos/login/login_wizard.h"
15 #include "chrome/browser/chromeos/login/wizard_controller.h" 15 #include "chrome/browser/chromeos/login/wizard_controller.h"
16 #include "chrome/browser/extensions/extension_system.h" 16 #include "chrome/browser/extensions/extension_system.h"
17 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
21 #include "chrome/test/base/interactive_test_utils.h" 21 #include "chrome/test/base/interactive_test_utils.h"
22 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/ui_test_utils.h" 23 #include "chrome/test/base/ui_test_utils.h"
24 #include "chromeos/chromeos_switches.h"
25 #include "content/public/browser/notification_observer.h" 24 #include "content/public/browser/notification_observer.h"
26 #include "content/public/browser/notification_registrar.h" 25 #include "content/public/browser/notification_registrar.h"
27 #include "content/public/browser/notification_service.h" 26 #include "content/public/browser/notification_service.h"
28 #include "content/public/test/test_utils.h" 27 #include "content/public/test/test_utils.h"
29 #include "testing/gmock/include/gmock/gmock.h" 28 #include "testing/gmock/include/gmock/gmock.h"
30 #include "testing/gtest/include/gtest/gtest.h" 29 #include "testing/gtest/include/gtest/gtest.h"
31 30
32 using ::testing::_; 31 using ::testing::_;
33 using ::testing::AnyNumber; 32 using ::testing::AnyNumber;
34 using ::testing::Return; 33 using ::testing::Return;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 67
69 class LoginUserTest : public LoginTestBase { 68 class LoginUserTest : public LoginTestBase {
70 protected: 69 protected:
71 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 70 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
72 LoginTestBase::SetUpInProcessBrowserTestFixture(); 71 LoginTestBase::SetUpInProcessBrowserTestFixture();
73 } 72 }
74 73
75 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 74 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
76 command_line->AppendSwitchASCII(switches::kLoginUser, "TestUser@gmail.com"); 75 command_line->AppendSwitchASCII(switches::kLoginUser, "TestUser@gmail.com");
77 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); 76 command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
78 command_line->AppendSwitch(::switches::kNoFirstRun); 77 command_line->AppendSwitch(switches::kNoFirstRun);
79 } 78 }
80 }; 79 };
81 80
82 class LoginGuestTest : public LoginTestBase { 81 class LoginGuestTest : public LoginTestBase {
83 protected: 82 protected:
84 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 83 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
85 command_line->AppendSwitch(switches::kGuestSession); 84 command_line->AppendSwitch(switches::kGuestSession);
86 command_line->AppendSwitch(::switches::kIncognito); 85 command_line->AppendSwitch(switches::kIncognito);
87 command_line->AppendSwitchASCII(switches::kLoginProfile, "user"); 86 command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
88 command_line->AppendSwitch(::switches::kNoFirstRun); 87 command_line->AppendSwitch(switches::kNoFirstRun);
89 } 88 }
90 }; 89 };
91 90
92 class LoginCursorTest : public LoginTestBase { 91 class LoginCursorTest : public LoginTestBase {
93 protected: 92 protected:
94 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 93 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
95 command_line->AppendSwitch(switches::kLoginManager); 94 command_line->AppendSwitch(switches::kLoginManager);
96 } 95 }
97 }; 96 };
98 97
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // Verifies that the webui for login comes up successfully. 217 // Verifies that the webui for login comes up successfully.
219 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) { 218 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
220 scoped_refptr<content::MessageLoopRunner> runner = 219 scoped_refptr<content::MessageLoopRunner> runner =
221 new content::MessageLoopRunner; 220 new content::MessageLoopRunner;
222 content_browser_client_->browser_main_extra_parts_->set_quit_task( 221 content_browser_client_->browser_main_extra_parts_->set_quit_task(
223 runner->QuitClosure()); 222 runner->QuitClosure());
224 runner->Run(); 223 runner->Run();
225 } 224 }
226 225
227 } // namespace chromeos 226 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698