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

Side by Side Diff: chrome/browser/chromeos/certificate_provider/certificate_requests.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_requests.h" 5 #include "chrome/browser/chromeos/certificate_provider/certificate_requests.h"
6 6
7 #include <memory>
7 #include <set> 8 #include <set>
8 #include <utility> 9 #include <utility>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/callback.h" 12 #include "base/callback.h"
12 #include "base/location.h" 13 #include "base/location.h"
13 #include "base/logging.h" 14 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/time/time.h" 15 #include "base/time/time.h"
16 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 namespace certificate_provider { 19 namespace certificate_provider {
20 20
21 namespace { 21 namespace {
22 const int kGetCertificatesTimeoutInMinutes = 5; 22 const int kGetCertificatesTimeoutInMinutes = 5;
23 } // namespace 23 } // namespace
24 24
(...skipping 18 matching lines...) Expand all
43 }; 43 };
44 44
45 CertificateRequests::CertificateRequests() {} 45 CertificateRequests::CertificateRequests() {}
46 46
47 CertificateRequests::~CertificateRequests() {} 47 CertificateRequests::~CertificateRequests() {}
48 48
49 int CertificateRequests::AddRequest( 49 int CertificateRequests::AddRequest(
50 const std::vector<std::string>& extension_ids, 50 const std::vector<std::string>& extension_ids,
51 const base::Callback<void(const net::CertificateList&)>& callback, 51 const base::Callback<void(const net::CertificateList&)>& callback,
52 const base::Callback<void(int)>& timeout_callback) { 52 const base::Callback<void(int)>& timeout_callback) {
53 scoped_ptr<CertificateRequestState> state(new CertificateRequestState); 53 std::unique_ptr<CertificateRequestState> state(new CertificateRequestState);
54 state->callback = callback; 54 state->callback = callback;
55 state->pending_extensions.insert(extension_ids.begin(), extension_ids.end()); 55 state->pending_extensions.insert(extension_ids.begin(), extension_ids.end());
56 56
57 const int request_id = next_free_request_id_++; 57 const int request_id = next_free_request_id_++;
58 state->timeout.Start( 58 state->timeout.Start(
59 FROM_HERE, base::TimeDelta::FromMinutes(kGetCertificatesTimeoutInMinutes), 59 FROM_HERE, base::TimeDelta::FromMinutes(kGetCertificatesTimeoutInMinutes),
60 base::Bind(timeout_callback, request_id)); 60 base::Bind(timeout_callback, request_id));
61 61
62 const auto insert_result = 62 const auto insert_result =
63 requests_.insert(std::make_pair(request_id, std::move(state))); 63 requests_.insert(std::make_pair(request_id, std::move(state)));
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 CertificateRequestState& state = *entry.second.get(); 110 CertificateRequestState& state = *entry.second.get();
111 state.pending_extensions.erase(extension_id); 111 state.pending_extensions.erase(extension_id);
112 if (state.pending_extensions.empty()) 112 if (state.pending_extensions.empty())
113 completed_requests.push_back(entry.first); 113 completed_requests.push_back(entry.first);
114 } 114 }
115 return completed_requests; 115 return completed_requests;
116 } 116 }
117 117
118 } // namespace certificate_provider 118 } // namespace certificate_provider
119 } // namespace chromeos 119 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698