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

Side by Side Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler_unittest.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/policy/consumer_enrollment_handler.h" 5 #include "chrome/browser/chromeos/policy/consumer_enrollment_handler.h"
6 6
7 #include <memory>
7 #include <utility> 8 #include <utility>
8 9
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/ptr_util.h"
10 #include "base/run_loop.h" 11 #include "base/run_loop.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/browser_process_platform_part.h" 14 #include "chrome/browser/browser_process_platform_part.h"
14 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 15 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
15 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 16 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
16 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 17 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
17 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 18 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
18 #include "chrome/browser/chromeos/policy/consumer_management_stage.h" 19 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
19 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h" 20 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
(...skipping 30 matching lines...) Expand all
50 new TestingProfileManager(TestingBrowserProcess::GetGlobal())) { 51 new TestingProfileManager(TestingBrowserProcess::GetGlobal())) {
51 // Set up FakeConsumerManagementService. 52 // Set up FakeConsumerManagementService.
52 fake_service_->SetStatusAndStage( 53 fake_service_->SetStatusAndStage(
53 ConsumerManagementService::STATUS_ENROLLING, 54 ConsumerManagementService::STATUS_ENROLLING,
54 ConsumerManagementStage::EnrollmentOwnerStored()); 55 ConsumerManagementStage::EnrollmentOwnerStored());
55 56
56 // Inject fake objects. 57 // Inject fake objects.
57 BrowserPolicyConnectorChromeOS* connector = 58 BrowserPolicyConnectorChromeOS* connector =
58 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 59 g_browser_process->platform_part()->browser_policy_connector_chromeos();
59 connector->SetConsumerManagementServiceForTesting( 60 connector->SetConsumerManagementServiceForTesting(
60 make_scoped_ptr(fake_service_)); 61 base::WrapUnique(fake_service_));
61 connector->SetDeviceCloudPolicyInitializerForTesting( 62 connector->SetDeviceCloudPolicyInitializerForTesting(
62 make_scoped_ptr(fake_initializer_)); 63 base::WrapUnique(fake_initializer_));
63 64
64 // Set up FakeChromeUserManager. 65 // Set up FakeChromeUserManager.
65 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestOwner)); 66 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestOwner));
66 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestUser)); 67 fake_user_manager_->AddUser(AccountId::FromUserEmail(kTestUser));
67 fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kTestOwner)); 68 fake_user_manager_->set_owner_id(AccountId::FromUserEmail(kTestOwner));
68 } 69 }
69 70
70 void SetUp() override { 71 void SetUp() override {
71 ASSERT_TRUE(testing_profile_manager_->SetUp()); 72 ASSERT_TRUE(testing_profile_manager_->SetUp());
72 TestingProfile::TestingFactories factories; 73 TestingProfile::TestingFactories factories;
73 factories.push_back( 74 factories.push_back(
74 std::make_pair(ProfileOAuth2TokenServiceFactory::GetInstance(), 75 std::make_pair(ProfileOAuth2TokenServiceFactory::GetInstance(),
75 BuildAutoIssuingFakeProfileOAuth2TokenService)); 76 BuildAutoIssuingFakeProfileOAuth2TokenService));
76 profile_ = testing_profile_manager_->CreateTestingProfile( 77 profile_ = testing_profile_manager_->CreateTestingProfile(
77 kTestUser, scoped_ptr<syncable_prefs::PrefServiceSyncable>(), 78 kTestUser, std::unique_ptr<syncable_prefs::PrefServiceSyncable>(),
78 base::UTF8ToUTF16(kTestUser), 0, std::string(), factories); 79 base::UTF8ToUTF16(kTestUser), 0, std::string(), factories);
79 80
80 // Set up the authenticated user name and ID. 81 // Set up the authenticated user name and ID.
81 SigninManagerFactory::GetForProfile(profile_) 82 SigninManagerFactory::GetForProfile(profile_)
82 ->SetAuthenticatedAccountInfo(kTestOwner, kTestOwner); 83 ->SetAuthenticatedAccountInfo(kTestOwner, kTestOwner);
83 84
84 // Issue a fake refresh token. 85 // Issue a fake refresh token.
85 GetFakeProfileOAuth2TokenService()->UpdateCredentials(kTestOwner, 86 GetFakeProfileOAuth2TokenService()->UpdateCredentials(kTestOwner,
86 "fake_token"); 87 "fake_token");
87 } 88 }
88 89
89 FakeProfileOAuth2TokenService* GetFakeProfileOAuth2TokenService() { 90 FakeProfileOAuth2TokenService* GetFakeProfileOAuth2TokenService() {
90 return static_cast<FakeProfileOAuth2TokenService*>( 91 return static_cast<FakeProfileOAuth2TokenService*>(
91 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)); 92 ProfileOAuth2TokenServiceFactory::GetForProfile(profile_));
92 } 93 }
93 94
94 void RunEnrollmentTest() { 95 void RunEnrollmentTest() {
95 handler_.reset( 96 handler_.reset(
96 new ConsumerEnrollmentHandler(profile_, fake_service_, NULL)); 97 new ConsumerEnrollmentHandler(profile_, fake_service_, NULL));
97 base::RunLoop().RunUntilIdle(); 98 base::RunLoop().RunUntilIdle();
98 } 99 }
99 100
100 content::TestBrowserThreadBundle thread_bundle; 101 content::TestBrowserThreadBundle thread_bundle;
101 FakeConsumerManagementService* fake_service_; 102 FakeConsumerManagementService* fake_service_;
102 FakeDeviceCloudPolicyInitializer* fake_initializer_; 103 FakeDeviceCloudPolicyInitializer* fake_initializer_;
103 chromeos::FakeChromeUserManager* fake_user_manager_; 104 chromeos::FakeChromeUserManager* fake_user_manager_;
104 chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_; 105 chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
105 scoped_ptr<TestingProfileManager> testing_profile_manager_; 106 std::unique_ptr<TestingProfileManager> testing_profile_manager_;
106 Profile* profile_; 107 Profile* profile_;
107 scoped_ptr<ConsumerEnrollmentHandler> handler_; 108 std::unique_ptr<ConsumerEnrollmentHandler> handler_;
108 }; 109 };
109 110
110 TEST_F(ConsumerEnrollmentHandlerTest, EnrollsSuccessfully) { 111 TEST_F(ConsumerEnrollmentHandlerTest, EnrollsSuccessfully) {
111 EXPECT_FALSE(fake_initializer_->was_start_enrollment_called()); 112 EXPECT_FALSE(fake_initializer_->was_start_enrollment_called());
112 113
113 RunEnrollmentTest(); 114 RunEnrollmentTest();
114 115
115 EXPECT_TRUE(fake_initializer_->was_start_enrollment_called()); 116 EXPECT_TRUE(fake_initializer_->was_start_enrollment_called());
116 EXPECT_EQ(ConsumerManagementStage::EnrollmentSuccess(), 117 EXPECT_EQ(ConsumerManagementStage::EnrollmentSuccess(),
117 fake_service_->GetStage()); 118 fake_service_->GetStage());
(...skipping 29 matching lines...) Expand all
147 EnrollmentStatus::STATUS_REGISTRATION_FAILED)); 148 EnrollmentStatus::STATUS_REGISTRATION_FAILED));
148 149
149 RunEnrollmentTest(); 150 RunEnrollmentTest();
150 151
151 EXPECT_TRUE(fake_initializer_->was_start_enrollment_called()); 152 EXPECT_TRUE(fake_initializer_->was_start_enrollment_called());
152 EXPECT_EQ(ConsumerManagementStage::EnrollmentDMServerFailed(), 153 EXPECT_EQ(ConsumerManagementStage::EnrollmentDMServerFailed(),
153 fake_service_->GetStage()); 154 fake_service_->GetStage());
154 } 155 }
155 156
156 } // namespace policy 157 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698