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

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

Issue 287083003: Multi-profile flag cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Created 6 years, 7 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 "chrome/browser/chromeos/login/login_manager_test.h" 5 #include "chrome/browser/chromeos/login/login_manager_test.h"
6 6
7 #include "base/prefs/scoped_user_pref_update.h" 7 #include "base/prefs/scoped_user_pref_update.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/chromeos/login/existing_user_controller.h" 10 #include "chrome/browser/chromeos/login/existing_user_controller.h"
11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 11 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 12 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
13 #include "chrome/browser/chromeos/login/users/user_manager.h" 13 #include "chrome/browser/chromeos/login/users/user_manager.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
Nikita (slow) 2014/05/19 14:27:15 nit: not used
15 #include "chromeos/chromeos_switches.h" 15 #include "chromeos/chromeos_switches.h"
16 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
17 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
18 #include "content/public/test/browser_test_utils.h" 18 #include "content/public/test/browser_test_utils.h"
19 #include "content/public/test/test_utils.h" 19 #include "content/public/test/test_utils.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 21
22 namespace chromeos { 22 namespace chromeos {
23 23
24 LoginManagerTest::LoginManagerTest(bool should_launch_browser) 24 LoginManagerTest::LoginManagerTest(bool should_launch_browser)
25 : should_launch_browser_(should_launch_browser), 25 : should_launch_browser_(should_launch_browser),
26 web_contents_(NULL) { 26 web_contents_(NULL) {
27 set_exit_when_last_browser_closes(false); 27 set_exit_when_last_browser_closes(false);
28 } 28 }
29 29
30 void LoginManagerTest::CleanUpOnMainThread() { 30 void LoginManagerTest::CleanUpOnMainThread() {
31 if (LoginDisplayHostImpl::default_host()) 31 if (LoginDisplayHostImpl::default_host())
32 LoginDisplayHostImpl::default_host()->Finalize(); 32 LoginDisplayHostImpl::default_host()->Finalize();
33 base::MessageLoop::current()->RunUntilIdle(); 33 base::MessageLoop::current()->RunUntilIdle();
34 } 34 }
35 35
36 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { 36 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
37 command_line->AppendSwitch(chromeos::switches::kLoginManager); 37 command_line->AppendSwitch(chromeos::switches::kLoginManager);
38 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 38 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
39 command_line->AppendSwitch(::switches::kMultiProfiles);
40 } 39 }
41 40
42 void LoginManagerTest::SetUpInProcessBrowserTestFixture() { 41 void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
43 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>(); 42 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>();
44 mock_login_utils_->DelegateToFake(); 43 mock_login_utils_->DelegateToFake();
45 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser( 44 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser(
46 should_launch_browser_); 45 should_launch_browser_);
47 LoginUtils::Set(mock_login_utils_); 46 LoginUtils::Set(mock_login_utils_);
48 } 47 }
49 48
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 EXPECT_TRUE(host != NULL); 112 EXPECT_TRUE(host != NULL);
114 113
115 content::WebContents* web_contents = 114 content::WebContents* web_contents =
116 host->GetWebUILoginView()->GetWebContents(); 115 host->GetWebUILoginView()->GetWebContents();
117 EXPECT_TRUE(web_contents != NULL); 116 EXPECT_TRUE(web_contents != NULL);
118 set_web_contents(web_contents); 117 set_web_contents(web_contents);
119 js_checker_.set_web_contents(web_contents); 118 js_checker_.set_web_contents(web_contents);
120 } 119 }
121 120
122 } // namespace chromeos 121 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698