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

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

Issue 294033002: Multi-profile flag cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Return --test-type flag back to profile_manager_unittest.cc 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 | Annotate | Revision Log
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/auth/user_context.h" 10 #include "chrome/browser/chromeos/login/auth/user_context.h"
11 #include "chrome/browser/chromeos/login/existing_user_controller.h" 11 #include "chrome/browser/chromeos/login/existing_user_controller.h"
12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" 12 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" 13 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
14 #include "chrome/browser/chromeos/login/users/user.h" 14 #include "chrome/browser/chromeos/login/users/user.h"
15 #include "chrome/browser/chromeos/login/users/user_manager.h" 15 #include "chrome/browser/chromeos/login/users/user_manager.h"
16 #include "chrome/common/chrome_switches.h"
17 #include "chromeos/chromeos_switches.h" 16 #include "chromeos/chromeos_switches.h"
18 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
19 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
20 #include "content/public/test/browser_test_utils.h" 19 #include "content/public/test/browser_test_utils.h"
21 #include "content/public/test/test_utils.h" 20 #include "content/public/test/test_utils.h"
22 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
23 22
24 namespace chromeos { 23 namespace chromeos {
25 24
26 LoginManagerTest::LoginManagerTest(bool should_launch_browser) 25 LoginManagerTest::LoginManagerTest(bool should_launch_browser)
27 : should_launch_browser_(should_launch_browser), 26 : should_launch_browser_(should_launch_browser),
28 web_contents_(NULL) { 27 web_contents_(NULL) {
29 set_exit_when_last_browser_closes(false); 28 set_exit_when_last_browser_closes(false);
30 } 29 }
31 30
32 void LoginManagerTest::CleanUpOnMainThread() { 31 void LoginManagerTest::CleanUpOnMainThread() {
33 if (LoginDisplayHostImpl::default_host()) 32 if (LoginDisplayHostImpl::default_host())
34 LoginDisplayHostImpl::default_host()->Finalize(); 33 LoginDisplayHostImpl::default_host()->Finalize();
35 base::MessageLoop::current()->RunUntilIdle(); 34 base::MessageLoop::current()->RunUntilIdle();
36 } 35 }
37 36
38 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { 37 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) {
39 command_line->AppendSwitch(chromeos::switches::kLoginManager); 38 command_line->AppendSwitch(chromeos::switches::kLoginManager);
40 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 39 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
41 command_line->AppendSwitch(::switches::kMultiProfiles);
42 } 40 }
43 41
44 void LoginManagerTest::SetUpInProcessBrowserTestFixture() { 42 void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
45 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>(); 43 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>();
46 mock_login_utils_->DelegateToFake(); 44 mock_login_utils_->DelegateToFake();
47 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser( 45 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser(
48 should_launch_browser_); 46 should_launch_browser_);
49 LoginUtils::Set(mock_login_utils_); 47 LoginUtils::Set(mock_login_utils_);
50 } 48 }
51 49
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 EXPECT_TRUE(host != NULL); 115 EXPECT_TRUE(host != NULL);
118 116
119 content::WebContents* web_contents = 117 content::WebContents* web_contents =
120 host->GetWebUILoginView()->GetWebContents(); 118 host->GetWebUILoginView()->GetWebContents();
121 EXPECT_TRUE(web_contents != NULL); 119 EXPECT_TRUE(web_contents != NULL);
122 set_web_contents(web_contents); 120 set_web_contents(web_contents);
123 js_checker_.set_web_contents(web_contents); 121 js_checker_.set_web_contents(web_contents);
124 } 122 }
125 123
126 } // namespace chromeos 124 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698