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

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

Issue 23678007: OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 return ExistingUserController::current_controller(); 93 return ExistingUserController::current_controller();
94 } 94 }
95 95
96 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 96 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
97 SetUpSessionManager(); 97 SetUpSessionManager();
98 98
99 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture(); 99 DevicePolicyCrosBrowserTest::SetUpInProcessBrowserTestFixture();
100 100
101 mock_login_utils_ = new MockLoginUtils(); 101 mock_login_utils_ = new MockLoginUtils();
102 LoginUtils::Set(mock_login_utils_); 102 LoginUtils::Set(mock_login_utils_);
103 EXPECT_CALL(*mock_login_utils_, StopBackgroundFetchers())
104 .Times(AnyNumber());
105 EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_)) 103 EXPECT_CALL(*mock_login_utils_, DelegateDeleted(_))
106 .Times(1); 104 .Times(1);
107 105
108 mock_login_display_host_.reset(new MockLoginDisplayHost()); 106 mock_login_display_host_.reset(new MockLoginDisplayHost());
109 mock_login_display_ = new MockLoginDisplay(); 107 mock_login_display_ = new MockLoginDisplay();
110 SetUpLoginDisplay(); 108 SetUpLoginDisplay();
111 } 109 }
112 110
113 virtual void SetUpSessionManager() { 111 virtual void SetUpSessionManager() {
114 } 112 }
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 678
681 INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation, 679 INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation,
682 ExistingUserControllerTest, 680 ExistingUserControllerTest,
683 testing::Bool()); 681 testing::Bool());
684 682
685 INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation, 683 INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation,
686 ExistingUserControllerPublicSessionTest, 684 ExistingUserControllerPublicSessionTest,
687 testing::Bool()); 685 testing::Bool());
688 686
689 } // namespace chromeos 687 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('k') | chrome/browser/chromeos/login/fake_login_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698