chrome/browser/chromeos/login/wizard_controller_browsertest.cc - Issue 2498003: Revert r48735 "Added user image screen for new user login (or old user logging in through"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2498003: Revert r48735 "Added user image screen for new user login (or old user logging in through" (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: removed grd files from cl Created 10 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

« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "app/l10n_util.h"	5 #include "app/l10n_util.h"

6 #include "chrome/browser/browser_process.h"	6 #include "chrome/browser/browser_process.h"

7 #include "chrome/browser/chromeos/login/account_screen.h"	7 #include "chrome/browser/chromeos/login/account_screen.h"

8 #include "chrome/browser/chromeos/login/language_switch_model.h"	8 #include "chrome/browser/chromeos/login/language_switch_model.h"

9 #include "chrome/browser/chromeos/login/login_screen.h"	9 #include "chrome/browser/chromeos/login/login_screen.h"

10 #include "chrome/browser/chromeos/login/mock_update_screen.h"	10 #include "chrome/browser/chromeos/login/mock_update_screen.h"

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
169 }	169 }

170	170

171 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) {	171 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) {

172 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());	172 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());

173 EXPECT_CALL(*mock_login_screen_, Show()).Times(1);	173 EXPECT_CALL(*mock_login_screen_, Show()).Times(1);

174 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);	174 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);

175 controller()->OnExit(chromeos::ScreenObserver::NETWORK_OFFLINE);	175 controller()->OnExit(chromeos::ScreenObserver::NETWORK_OFFLINE);

176 EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());	176 EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());

177 }	177 }

178	178

179 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 14,	179 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 12,

180 add_tests_for_new_control_flow_you_just_introduced);	180 add_tests_for_new_control_flow_you_just_introduced);

OLD	NEW