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

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

Issue 819133004: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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"
(...skipping 18 matching lines...) Expand all
29 set_exit_when_last_browser_closes(false); 29 set_exit_when_last_browser_closes(false);
30 } 30 }
31 31
32 void LoginManagerTest::TearDownOnMainThread() { 32 void LoginManagerTest::TearDownOnMainThread() {
33 MixinBasedBrowserTest::TearDownOnMainThread(); 33 MixinBasedBrowserTest::TearDownOnMainThread();
34 if (LoginDisplayHostImpl::default_host()) 34 if (LoginDisplayHostImpl::default_host())
35 LoginDisplayHostImpl::default_host()->Finalize(); 35 LoginDisplayHostImpl::default_host()->Finalize();
36 base::MessageLoop::current()->RunUntilIdle(); 36 base::MessageLoop::current()->RunUntilIdle();
37 } 37 }
38 38
39 void LoginManagerTest::SetUpCommandLine(CommandLine* command_line) { 39 void LoginManagerTest::SetUpCommandLine(base::CommandLine* command_line) {
40 command_line->AppendSwitch(chromeos::switches::kLoginManager); 40 command_line->AppendSwitch(chromeos::switches::kLoginManager);
41 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests); 41 command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
42 MixinBasedBrowserTest::SetUpCommandLine(command_line); 42 MixinBasedBrowserTest::SetUpCommandLine(command_line);
43 } 43 }
44 44
45 void LoginManagerTest::SetUpInProcessBrowserTestFixture() { 45 void LoginManagerTest::SetUpInProcessBrowserTestFixture() {
46 MixinBasedBrowserTest::SetUpInProcessBrowserTestFixture(); 46 MixinBasedBrowserTest::SetUpInProcessBrowserTestFixture();
47 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>(); 47 mock_login_utils_ = new testing::NiceMock<MockLoginUtils>();
48 mock_login_utils_->DelegateToFake(); 48 mock_login_utils_->DelegateToFake();
49 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser( 49 mock_login_utils_->GetFakeLoginUtils()->set_should_launch_browser(
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 EXPECT_TRUE(host != NULL); 123 EXPECT_TRUE(host != NULL);
124 124
125 content::WebContents* web_contents = 125 content::WebContents* web_contents =
126 host->GetWebUILoginView()->GetWebContents(); 126 host->GetWebUILoginView()->GetWebContents();
127 EXPECT_TRUE(web_contents != NULL); 127 EXPECT_TRUE(web_contents != NULL);
128 set_web_contents(web_contents); 128 set_web_contents(web_contents);
129 js_checker_.set_web_contents(web_contents); 129 js_checker_.set_web_contents(web_contents);
130 } 130 }
131 131
132 } // namespace chromeos 132 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | chrome/browser/chromeos/login/login_screen_policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698