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

Side by Side Diff: chrome/browser/chromeos/certificate_provider/certificate_provider_service_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/certificate_provider/certificate_provider_serv ice.h" 5 #include "chrome/browser/chromeos/certificate_provider/certificate_provider_serv ice.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 130
131 class CertificateProviderServiceTest : public testing::Test { 131 class CertificateProviderServiceTest : public testing::Test {
132 public: 132 public:
133 CertificateProviderServiceTest() 133 CertificateProviderServiceTest()
134 : task_runner_(new base::TestMockTimeTaskRunner()), 134 : task_runner_(new base::TestMockTimeTaskRunner()),
135 task_runner_handle_(task_runner_), 135 task_runner_handle_(task_runner_),
136 client_key_store_(net::ClientKeyStore::GetInstance()), 136 client_key_store_(net::ClientKeyStore::GetInstance()),
137 service_(new CertificateProviderService()), 137 service_(new CertificateProviderService()),
138 cert_info1_(CreateCertInfo("client_1.pem")), 138 cert_info1_(CreateCertInfo("client_1.pem")),
139 cert_info2_(CreateCertInfo("client_2.pem")) { 139 cert_info2_(CreateCertInfo("client_2.pem")) {
140 scoped_ptr<TestDelegate> test_delegate(new TestDelegate); 140 std::unique_ptr<TestDelegate> test_delegate(new TestDelegate);
141 test_delegate_ = test_delegate.get(); 141 test_delegate_ = test_delegate.get();
142 service_->SetDelegate(std::move(test_delegate)); 142 service_->SetDelegate(std::move(test_delegate));
143 143
144 certificate_provider_ = service_->CreateCertificateProvider(); 144 certificate_provider_ = service_->CreateCertificateProvider();
145 EXPECT_TRUE(certificate_provider_); 145 EXPECT_TRUE(certificate_provider_);
146 146
147 test_delegate_->provider_extensions_.insert(kExtension1); 147 test_delegate_->provider_extensions_.insert(kExtension1);
148 } 148 }
149 149
150 // Triggers a GetCertificates request and returns the request id. Assumes that 150 // Triggers a GetCertificates request and returns the request id. Assumes that
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 LOG(ERROR) << "Wrong extension id. Got " << extension_id; 203 LOG(ERROR) << "Wrong extension id. Got " << extension_id;
204 return false; 204 return false;
205 } 205 }
206 return true; 206 return true;
207 } 207 }
208 208
209 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_; 209 scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
210 base::ThreadTaskRunnerHandle task_runner_handle_; 210 base::ThreadTaskRunnerHandle task_runner_handle_;
211 TestDelegate* test_delegate_ = nullptr; 211 TestDelegate* test_delegate_ = nullptr;
212 net::ClientKeyStore* const client_key_store_; 212 net::ClientKeyStore* const client_key_store_;
213 scoped_ptr<CertificateProvider> certificate_provider_; 213 std::unique_ptr<CertificateProvider> certificate_provider_;
214 scoped_ptr<CertificateProviderService> service_; 214 std::unique_ptr<CertificateProviderService> service_;
215 const certificate_provider::CertificateInfo cert_info1_; 215 const certificate_provider::CertificateInfo cert_info1_;
216 const certificate_provider::CertificateInfo cert_info2_; 216 const certificate_provider::CertificateInfo cert_info2_;
217 217
218 private: 218 private:
219 DISALLOW_COPY_AND_ASSIGN(CertificateProviderServiceTest); 219 DISALLOW_COPY_AND_ASSIGN(CertificateProviderServiceTest);
220 }; 220 };
221 221
222 TEST_F(CertificateProviderServiceTest, GetCertificates) { 222 TEST_F(CertificateProviderServiceTest, GetCertificates) {
223 test_delegate_->provider_extensions_.insert(kExtension2); 223 test_delegate_->provider_extensions_.insert(kExtension2);
224 224
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 EXPECT_EQ(net::OK, error); 480 EXPECT_EQ(net::OK, error);
481 481
482 // Unload the extension. 482 // Unload the extension.
483 service_->OnExtensionUnloaded(kExtension1); 483 service_->OnExtensionUnloaded(kExtension1);
484 484
485 task_runner_->RunUntilIdle(); 485 task_runner_->RunUntilIdle();
486 EXPECT_EQ(net::ERR_FAILED, error); 486 EXPECT_EQ(net::ERR_FAILED, error);
487 } 487 }
488 488
489 } // namespace chromeos 489 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698