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

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

Issue 10832019: Speed up custom wallpaper switching time and wallpaper manager code refactor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 8 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
10 #include "chrome/browser/chromeos/cros/cros_mock.h" 10 #include "chrome/browser/chromeos/cros/cros_mock.h"
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 LoginUtils::Set(mock_login_utils_); 129 LoginUtils::Set(mock_login_utils_);
130 EXPECT_CALL(*mock_login_utils_, PrewarmAuthentication()) 130 EXPECT_CALL(*mock_login_utils_, PrewarmAuthentication())
131 .Times(AnyNumber()); 131 .Times(AnyNumber());
132 EXPECT_CALL(*mock_login_utils_, StopBackgroundFetchers()) 132 EXPECT_CALL(*mock_login_utils_, StopBackgroundFetchers())
133 .Times(AnyNumber()); 133 .Times(AnyNumber());
134 EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_)) 134 EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_))
135 .Times(1); 135 .Times(1);
136 136
137 mock_login_display_host_.reset(new MockLoginDisplayHost()); 137 mock_login_display_host_.reset(new MockLoginDisplayHost());
138 138
139 EXPECT_CALL(*mock_user_manager_.user_manager(), InitializeWallpaper())
140 .Times(1);
141 EXPECT_CALL(*mock_user_manager_.user_manager(), IsKnownUser(kUsername)) 139 EXPECT_CALL(*mock_user_manager_.user_manager(), IsKnownUser(kUsername))
142 .Times(AnyNumber()) 140 .Times(AnyNumber())
143 .WillRepeatedly(Return(true)); 141 .WillRepeatedly(Return(true));
144 EXPECT_CALL(*mock_user_manager_.user_manager(), IsKnownUser(kNewUsername)) 142 EXPECT_CALL(*mock_user_manager_.user_manager(), IsKnownUser(kNewUsername))
145 .Times(AnyNumber()) 143 .Times(AnyNumber())
146 .WillRepeatedly(Return(false)); 144 .WillRepeatedly(Return(false));
147 EXPECT_CALL(*mock_user_manager_.user_manager(), IsUserLoggedIn()) 145 EXPECT_CALL(*mock_user_manager_.user_manager(), IsUserLoggedIn())
148 .Times(AnyNumber()) 146 .Times(AnyNumber())
149 .WillRepeatedly(Return(false)); 147 .WillRepeatedly(Return(false));
150 EXPECT_CALL(*mock_user_manager_.user_manager(), IsLoggedInAsGuest()) 148 EXPECT_CALL(*mock_user_manager_.user_manager(), IsLoggedInAsGuest())
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin()) 315 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())
318 .Times(1); 316 .Times(1);
319 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew()) 317 EXPECT_CALL(*mock_user_manager_.user_manager(), IsCurrentUserNew())
320 .Times(AnyNumber()) 318 .Times(AnyNumber())
321 .WillRepeatedly(Return(true)); 319 .WillRepeatedly(Return(true));
322 existing_user_controller()->CompleteLogin(kNewUsername, kPassword); 320 existing_user_controller()->CompleteLogin(kNewUsername, kPassword);
323 content::RunAllPendingInMessageLoop(); 321 content::RunAllPendingInMessageLoop();
324 } 322 }
325 323
326 } // namespace chromeos 324 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698