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

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

Issue 16871010: Rewrite scoped_ptr<T>(NULL) to use the default ctor in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 ACTION_P2(CreateAuthenticator, username, password) { 76 ACTION_P2(CreateAuthenticator, username, password) {
77 return new MockAuthenticator(arg0, username, password); 77 return new MockAuthenticator(arg0, username, password);
78 } 78 }
79 79
80 } // namespace 80 } // namespace
81 81
82 class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest, 82 class ExistingUserControllerTest : public policy::DevicePolicyCrosBrowserTest,
83 public testing::WithParamInterface<bool> { 83 public testing::WithParamInterface<bool> {
84 protected: 84 protected:
85 ExistingUserControllerTest() 85 ExistingUserControllerTest()
86 : mock_login_display_(NULL), 86 : mock_login_display_(NULL), mock_user_manager_(NULL) {}
87 mock_user_manager_(NULL),
88 testing_profile_(NULL) {
89 }
90 87
91 ExistingUserController* existing_user_controller() { 88 ExistingUserController* existing_user_controller() {
92 return ExistingUserController::current_controller(); 89 return ExistingUserController::current_controller();
93 } 90 }
94 91
95 const ExistingUserController* existing_user_controller() const { 92 const ExistingUserController* existing_user_controller() const {
96 return ExistingUserController::current_controller(); 93 return ExistingUserController::current_controller();
97 } 94 }
98 95
99 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 96 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 684
688 INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation, 685 INSTANTIATE_TEST_CASE_P(ExistingUserControllerTestInstantiation,
689 ExistingUserControllerTest, 686 ExistingUserControllerTest,
690 testing::Bool()); 687 testing::Bool());
691 688
692 INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation, 689 INSTANTIATE_TEST_CASE_P(ExistingUserControllerPublicSessionTestInstantiation,
693 ExistingUserControllerPublicSessionTest, 690 ExistingUserControllerPublicSessionTest,
694 testing::Bool()); 691 testing::Bool());
695 692
696 } // namespace chromeos 693 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698