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

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

Issue 745613002: [cros] Cleanup: remove LoginUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get rid of FakeChromeUserManager usage in ExistingUserController* tests Created 5 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/existing_user_controller.h" 9 #include "chrome/browser/chromeos/login/existing_user_controller.h"
10 #include "chrome/browser/chromeos/login/mock_login_utils.h"
11 #include "chrome/browser/chromeos/login/ui/mock_login_display.h" 10 #include "chrome/browser/chromeos/login/ui/mock_login_display.h"
12 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h" 11 #include "chrome/browser/chromeos/login/ui/mock_login_display_host.h"
13 #include "chrome/browser/chromeos/login/users/mock_user_manager.h" 12 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
14 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 13 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
15 #include "chrome/browser/chromeos/policy/device_local_account.h" 14 #include "chrome/browser/chromeos/policy/device_local_account.h"
16 #include "chrome/browser/chromeos/settings/cros_settings.h" 15 #include "chrome/browser/chromeos/settings/cros_settings.h"
17 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" 16 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
18 #include "chrome/test/base/scoped_testing_local_state.h" 17 #include "chrome/test/base/scoped_testing_local_state.h"
19 #include "chrome/test/base/testing_browser_process.h" 18 #include "chrome/test/base/testing_browser_process.h"
20 #include "chromeos/settings/cros_settings_names.h" 19 #include "chromeos/settings/cros_settings_names.h"
(...skipping 26 matching lines...) Expand all
47 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)), 46 policy::DeviceLocalAccount::TYPE_PUBLIC_SESSION)),
48 ui_thread_(content::BrowserThread::UI, &message_loop_), 47 ui_thread_(content::BrowserThread::UI, &message_loop_),
49 local_state_(TestingBrowserProcess::GetGlobal()), 48 local_state_(TestingBrowserProcess::GetGlobal()),
50 mock_user_manager_(new MockUserManager()), 49 mock_user_manager_(new MockUserManager()),
51 scoped_user_manager_(mock_user_manager_) { 50 scoped_user_manager_(mock_user_manager_) {
52 } 51 }
53 52
54 void SetUp() override { 53 void SetUp() override {
55 mock_login_display_host_.reset(new MockLoginDisplayHost); 54 mock_login_display_host_.reset(new MockLoginDisplayHost);
56 mock_login_display_ = new MockLoginDisplay(); 55 mock_login_display_ = new MockLoginDisplay();
57 mock_login_utils_ = new MockLoginUtils();
58 LoginUtils::Set(mock_login_utils_);
59 56
60 EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_)) 57 EXPECT_CALL(*mock_login_display_host_.get(), CreateLoginDisplay(_))
61 .Times(1) 58 .Times(1)
62 .WillOnce(Return(mock_login_display_)); 59 .WillOnce(Return(mock_login_display_));
63 60
64 EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_)).Times(AnyNumber());
65
66 EXPECT_CALL(*mock_user_manager_, Shutdown()).Times(AnyNumber()); 61 EXPECT_CALL(*mock_user_manager_, Shutdown()).Times(AnyNumber());
67 EXPECT_CALL(*mock_user_manager_, FindUser(_)) 62 EXPECT_CALL(*mock_user_manager_, FindUser(_))
68 .WillRepeatedly(ReturnNull()); 63 .WillRepeatedly(ReturnNull());
69 EXPECT_CALL(*mock_user_manager_, FindUser(auto_login_user_id_)) 64 EXPECT_CALL(*mock_user_manager_, FindUser(auto_login_user_id_))
70 .WillRepeatedly(Return( 65 .WillRepeatedly(Return(
71 mock_user_manager_->CreatePublicAccountUser(auto_login_user_id_))); 66 mock_user_manager_->CreatePublicAccountUser(auto_login_user_id_)));
72 67
73 existing_user_controller_.reset( 68 existing_user_controller_.reset(
74 new ExistingUserController(mock_login_display_host_.get())); 69 new ExistingUserController(mock_login_display_host_.get()));
75 70
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 existing_user_controller()->is_login_in_progress_ = is_login_in_progress; 129 existing_user_controller()->is_login_in_progress_ = is_login_in_progress;
135 } 130 }
136 131
137 void ConfigureAutoLogin() { 132 void ConfigureAutoLogin() {
138 existing_user_controller()->ConfigurePublicSessionAutoLogin(); 133 existing_user_controller()->ConfigurePublicSessionAutoLogin();
139 } 134 }
140 135
141 const std::string auto_login_user_id_; 136 const std::string auto_login_user_id_;
142 137
143 private: 138 private:
144 // Owned by LoginUtilsWrapper.
145 MockLoginUtils* mock_login_utils_;
146
147 // |mock_login_display_| is owned by the ExistingUserController, which calls 139 // |mock_login_display_| is owned by the ExistingUserController, which calls
148 // CreateLoginDisplay() on the |mock_login_display_host_| to get it. 140 // CreateLoginDisplay() on the |mock_login_display_host_| to get it.
149 MockLoginDisplay* mock_login_display_; 141 MockLoginDisplay* mock_login_display_;
150 142
151 scoped_ptr<MockLoginDisplayHost> mock_login_display_host_; 143 scoped_ptr<MockLoginDisplayHost> mock_login_display_host_;
152 base::MessageLoopForUI message_loop_; 144 base::MessageLoopForUI message_loop_;
153 content::TestBrowserThread ui_thread_; 145 content::TestBrowserThread ui_thread_;
154 ScopedTestingLocalState local_state_; 146 ScopedTestingLocalState local_state_;
155 147
156 // Required by ExistingUserController: 148 // Required by ExistingUserController:
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 ConfigureAutoLogin(); 268 ConfigureAutoLogin();
277 ASSERT_TRUE(auto_login_timer()); 269 ASSERT_TRUE(auto_login_timer());
278 EXPECT_FALSE(auto_login_timer()->IsRunning()); 270 EXPECT_FALSE(auto_login_timer()->IsRunning());
279 EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(), 271 EXPECT_EQ(auto_login_timer()->GetCurrentDelay().InMilliseconds(),
280 kAutoLoginDelay2); 272 kAutoLoginDelay2);
281 EXPECT_EQ(auto_login_username(), ""); 273 EXPECT_EQ(auto_login_username(), "");
282 EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2); 274 EXPECT_EQ(auto_login_delay(), kAutoLoginDelay2);
283 } 275 }
284 276
285 } // namespace chromeos 277 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698