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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Issue 6893052: Make customization documents singletons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments resolved Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 1c00487528ec04af576002d0644d0ea4658898e6..0b2a25f388e53761d505ff279d17d1d5a9e081db 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -65,8 +65,7 @@ class MockLoginDisplayHost : public LoginDisplayHost {
MOCK_METHOD1(SetStatusAreaEnabled, void(bool));
MOCK_METHOD1(SetStatusAreaVisible, void(bool));
MOCK_METHOD0(ShowBackground, void(void));
- MOCK_METHOD3(StartWizard, void(const std::string&,
- const chromeos::StartupCustomizationDocument*,
+ MOCK_METHOD2(StartWizard, void(const std::string&,
const GURL&));
MOCK_METHOD0(StartSignInScreen, void(void));
@@ -186,7 +185,6 @@ IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, NewUserLogin) {
.Times(1);
EXPECT_CALL(*mock_login_display_host_,
StartWizard(WizardController::kUserImageScreenName,
- NULL,
GURL()))
.Times(1);
EXPECT_CALL(*mock_login_display_, OnFadeOut())
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698