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

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

Issue 21150006: Introduce --cancel-first-run and reduce the strength of --no-first-run. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add first_run::IsFirstRunSuppressed() Created 7 years, 4 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/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class LoginUserTest : public LoginTestBase { 58 class LoginUserTest : public LoginTestBase {
59 protected: 59 protected:
60 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 60 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
61 LoginTestBase::SetUpInProcessBrowserTestFixture(); 61 LoginTestBase::SetUpInProcessBrowserTestFixture();
62 } 62 }
63 63
64 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 64 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
65 command_line->AppendSwitchASCII( 65 command_line->AppendSwitchASCII(
66 chromeos::switches::kLoginUser, "TestUser@gmail.com"); 66 chromeos::switches::kLoginUser, "TestUser@gmail.com");
67 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 67 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
68 command_line->AppendSwitch(::switches::kNoFirstRun);
69 } 68 }
70 }; 69 };
71 70
72 class LoginGuestTest : public LoginTestBase { 71 class LoginGuestTest : public LoginTestBase {
73 protected: 72 protected:
74 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 73 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
75 command_line->AppendSwitch(chromeos::switches::kGuestSession); 74 command_line->AppendSwitch(chromeos::switches::kGuestSession);
76 command_line->AppendSwitch(::switches::kIncognito); 75 command_line->AppendSwitch(::switches::kIncognito);
77 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user"); 76 command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
78 command_line->AppendSwitch(::switches::kNoFirstRun);
79 } 77 }
80 }; 78 };
81 79
82 class LoginCursorTest : public LoginTestBase { 80 class LoginCursorTest : public LoginTestBase {
83 protected: 81 protected:
84 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 82 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
85 command_line->AppendSwitch(chromeos::switches::kLoginManager); 83 command_line->AppendSwitch(chromeos::switches::kLoginManager);
86 } 84 }
87 }; 85 };
88 86
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // Verifies that the webui for login comes up successfully. 204 // Verifies that the webui for login comes up successfully.
207 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) { 205 IN_PROC_BROWSER_TEST_F(LoginSigninTest, WebUIVisible) {
208 scoped_refptr<content::MessageLoopRunner> runner = 206 scoped_refptr<content::MessageLoopRunner> runner =
209 new content::MessageLoopRunner; 207 new content::MessageLoopRunner;
210 content_browser_client_->browser_main_extra_parts_->set_quit_task( 208 content_browser_client_->browser_main_extra_parts_->set_quit_task(
211 runner->QuitClosure()); 209 runner->QuitClosure());
212 runner->Run(); 210 runner->Run();
213 } 211 }
214 212
215 } // namespace 213 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698