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

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

Issue 10590004: [cros] Fake a stub user login when no --login-manager and --login-user are given. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Further test fixes. Created 8 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 | 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/compiler_specific.h" 7 #include "base/compiler_specific.h"
7 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
8 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
9 #include "chrome/browser/chromeos/cros/cros_mock.h" 10 #include "chrome/browser/chromeos/cros/cros_mock.h"
10 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 11 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
11 #include "chrome/browser/chromeos/cros/mock_network_library.h" 12 #include "chrome/browser/chromeos/cros/mock_network_library.h"
12 #include "chrome/browser/chromeos/login/existing_user_controller.h" 13 #include "chrome/browser/chromeos/login/existing_user_controller.h"
13 #include "chrome/browser/chromeos/login/helper.h" 14 #include "chrome/browser/chromeos/login/helper.h"
14 #include "chrome/browser/chromeos/login/login_display.h" 15 #include "chrome/browser/chromeos/login/login_display.h"
15 #include "chrome/browser/chromeos/login/login_display_host.h" 16 #include "chrome/browser/chromeos/login/login_display_host.h"
16 #include "chrome/browser/chromeos/login/login_performer.h" 17 #include "chrome/browser/chromeos/login/login_performer.h"
17 #include "chrome/browser/chromeos/login/login_status_consumer.h" 18 #include "chrome/browser/chromeos/login/login_status_consumer.h"
18 #include "chrome/browser/chromeos/login/login_utils.h" 19 #include "chrome/browser/chromeos/login/login_utils.h"
19 #include "chrome/browser/chromeos/login/mock_authenticator.h" 20 #include "chrome/browser/chromeos/login/mock_authenticator.h"
20 #include "chrome/browser/chromeos/login/mock_login_utils.h" 21 #include "chrome/browser/chromeos/login/mock_login_utils.h"
21 #include "chrome/browser/chromeos/login/mock_url_fetchers.h" 22 #include "chrome/browser/chromeos/login/mock_url_fetchers.h"
22 #include "chrome/browser/chromeos/login/mock_user_manager.h" 23 #include "chrome/browser/chromeos/login/mock_user_manager.h"
23 #include "chrome/browser/chromeos/login/wizard_controller.h" 24 #include "chrome/browser/chromeos/login/wizard_controller.h"
25 #include "chrome/common/chrome_switches.h"
24 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h" 26 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
25 #include "chrome/test/base/testing_profile.h" 27 #include "chrome/test/base/testing_profile.h"
26 #include "chrome/test/base/ui_test_utils.h" 28 #include "chrome/test/base/ui_test_utils.h"
27 #include "chromeos/dbus/mock_dbus_thread_manager.h" 29 #include "chromeos/dbus/mock_dbus_thread_manager.h"
28 #include "chromeos/dbus/mock_session_manager_client.h" 30 #include "chromeos/dbus/mock_session_manager_client.h"
29 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
30 #include "testing/gmock/include/gmock/gmock.h" 32 #include "testing/gmock/include/gmock/gmock.h"
31 #include "testing/gtest/include/gtest/gtest.h" 33 #include "testing/gtest/include/gtest/gtest.h"
32 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
33 35
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_)) 165 EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
164 .Times(1) 166 .Times(1)
165 .WillOnce(Return(mock_login_display_)); 167 .WillOnce(Return(mock_login_display_));
166 EXPECT_CALL(*mock_login_display_host_.get(), GetNativeWindow()) 168 EXPECT_CALL(*mock_login_display_host_.get(), GetNativeWindow())
167 .Times(1) 169 .Times(1)
168 .WillOnce(ReturnNull()); 170 .WillOnce(ReturnNull());
169 EXPECT_CALL(*mock_login_display_, Init(_, false, true, true)) 171 EXPECT_CALL(*mock_login_display_, Init(_, false, true, true))
170 .Times(1); 172 .Times(1);
171 } 173 }
172 174
175 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
176 command_line->AppendSwitch(switches::kLoginManager);
Nikita (slow) 2012/06/20 13:28:32 Please use NiceMock as discussed to cleanup output
Ivan Korotkov 2012/06/21 12:25:12 Done.
177 }
178
173 virtual void SetUpOnMainThread() OVERRIDE { 179 virtual void SetUpOnMainThread() OVERRIDE {
174 testing_profile_.reset(new TestingProfile()); 180 testing_profile_.reset(new TestingProfile());
175 existing_user_controller_.reset( 181 existing_user_controller_.reset(
176 new ExistingUserController(mock_login_display_host_.get())); 182 new ExistingUserController(mock_login_display_host_.get()));
177 ASSERT_EQ(existing_user_controller(), existing_user_controller_.get()); 183 ASSERT_EQ(existing_user_controller(), existing_user_controller_.get());
178 existing_user_controller_->Init(UserList()); 184 existing_user_controller_->Init(UserList());
179 profile_prepared_cb_ = 185 profile_prepared_cb_ =
180 base::Bind(&ExistingUserController::OnProfilePrepared, 186 base::Bind(&ExistingUserController::OnProfilePrepared,
181 base::Unretained(existing_user_controller()), 187 base::Unretained(existing_user_controller()),
182 testing_profile_.get()); 188 testing_profile_.get());
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 .Times(1); 308 .Times(1);
303 EXPECT_CALL(*mock_login_display_, OnFadeOut()) 309 EXPECT_CALL(*mock_login_display_, OnFadeOut())
304 .Times(1); 310 .Times(1);
305 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin()) 311 EXPECT_CALL(*mock_login_display_host_.get(), OnCompleteLogin())
306 .Times(1); 312 .Times(1);
307 existing_user_controller()->CompleteLogin(kNewUsername, kPassword); 313 existing_user_controller()->CompleteLogin(kNewUsername, kPassword);
308 ui_test_utils::RunAllPendingInMessageLoop(); 314 ui_test_utils::RunAllPendingInMessageLoop();
309 } 315 }
310 316
311 } // namespace chromeos 317 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698