chrome/browser/chromeos/login/reset_browsertest.cc - Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values.

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/reset_browsertest.cc

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)

Patch Set: Address comments Created 3 years, 11 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

OLD	NEW
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 <string>	5 #include <string>

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

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

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

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

10 #include "chrome/browser/chromeos/login/startup_utils.h"	11 #include "chrome/browser/chromeos/login/startup_utils.h"

11 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"	12 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"

12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"	13 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"

13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	14 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

14 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"

15 #include "chrome/common/chrome_switches.h"	15 #include "chrome/common/chrome_switches.h"

16 #include "chrome/common/pref_names.h"	16 #include "chrome/common/pref_names.h"

17 #include "chromeos/chromeos_switches.h"	17 #include "chromeos/chromeos_switches.h"

18 #include "chromeos/dbus/dbus_thread_manager.h"	18 #include "chromeos/dbus/dbus_thread_manager.h"

19 #include "chromeos/dbus/fake_power_manager_client.h"	19 #include "chromeos/dbus/fake_power_manager_client.h"

20 #include "chromeos/dbus/fake_session_manager_client.h"	20 #include "chromeos/dbus/fake_session_manager_client.h"

21 #include "chromeos/dbus/fake_update_engine_client.h"	21 #include "chromeos/dbus/fake_update_engine_client.h"

22 #include "components/prefs/pref_service.h"	22 #include "components/prefs/pref_service.h"

23 #include "content/public/test/browser_test_utils.h"	23 #include "content/public/test/browser_test_utils.h"

24	24

(...skipping 304 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
329 InvokeRollbackOption();	329 InvokeRollbackOption();

330 JSExpect("$('reset').classList.contains('rollback-proposal-view')");	330 JSExpect("$('reset').classList.contains('rollback-proposal-view')");

331 CloseResetScreen();	331 CloseResetScreen();

332 InvokeResetScreen();	332 InvokeResetScreen();

333 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_RESET).Wait();	333 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_RESET).Wait();

334 InvokeRollbackOption();	334 InvokeRollbackOption();

335 JSExpect("$('reset').classList.contains('rollback-proposal-view')");	335 JSExpect("$('reset').classList.contains('rollback-proposal-view')");

336 }	336 }

337	337

338 } // namespace chromeos	338 } // namespace chromeos

OLD	NEW