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

Side by Side Diff: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api.cc

Issue 564043004: Remove implicit conversions from scoped_refptr to T* in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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/extensions/api/enterprise_platform_keys/enterprise_plat form_keys_api.h" 5 #include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_plat form_keys_api.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/platform_keys/platform_keys.h" 9 #include "chrome/browser/chromeos/platform_keys/platform_keys.h"
10 #include "chrome/browser/chromeos/platform_keys/platform_keys_service.h" 10 #include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 scoped_ptr<api_epk::ImportCertificate::Params> params( 205 scoped_ptr<api_epk::ImportCertificate::Params> params(
206 api_epk::ImportCertificate::Params::Create(*args_)); 206 api_epk::ImportCertificate::Params::Create(*args_));
207 EXTENSION_FUNCTION_VALIDATE(params); 207 EXTENSION_FUNCTION_VALIDATE(params);
208 std::string platform_keys_token_id; 208 std::string platform_keys_token_id;
209 if (!ValidateToken(params->token_id, &platform_keys_token_id)) 209 if (!ValidateToken(params->token_id, &platform_keys_token_id))
210 return RespondNow(Error(kErrorInvalidToken)); 210 return RespondNow(Error(kErrorInvalidToken));
211 211
212 const std::string& cert_der = params->certificate; 212 const std::string& cert_der = params->certificate;
213 scoped_refptr<net::X509Certificate> cert_x509 = 213 scoped_refptr<net::X509Certificate> cert_x509 =
214 net::X509Certificate::CreateFromBytes(cert_der.data(), cert_der.size()); 214 net::X509Certificate::CreateFromBytes(cert_der.data(), cert_der.size());
215 if (!cert_x509) 215 if (!cert_x509.get())
216 return RespondNow(Error(kErrorInvalidX509Cert)); 216 return RespondNow(Error(kErrorInvalidX509Cert));
217 217
218 chromeos::platform_keys::ImportCertificate( 218 chromeos::platform_keys::ImportCertificate(
219 platform_keys_token_id, 219 platform_keys_token_id,
220 cert_x509, 220 cert_x509,
221 base::Bind(&EnterprisePlatformKeysImportCertificateFunction:: 221 base::Bind(&EnterprisePlatformKeysImportCertificateFunction::
222 OnImportedCertificate, 222 OnImportedCertificate,
223 this), 223 this),
224 browser_context()); 224 browser_context());
225 return RespondLater(); 225 return RespondLater();
(...skipping 17 matching lines...) Expand all
243 scoped_ptr<api_epk::RemoveCertificate::Params> params( 243 scoped_ptr<api_epk::RemoveCertificate::Params> params(
244 api_epk::RemoveCertificate::Params::Create(*args_)); 244 api_epk::RemoveCertificate::Params::Create(*args_));
245 EXTENSION_FUNCTION_VALIDATE(params); 245 EXTENSION_FUNCTION_VALIDATE(params);
246 std::string platform_keys_token_id; 246 std::string platform_keys_token_id;
247 if (!ValidateToken(params->token_id, &platform_keys_token_id)) 247 if (!ValidateToken(params->token_id, &platform_keys_token_id))
248 return RespondNow(Error(kErrorInvalidToken)); 248 return RespondNow(Error(kErrorInvalidToken));
249 249
250 const std::string& cert_der = params->certificate; 250 const std::string& cert_der = params->certificate;
251 scoped_refptr<net::X509Certificate> cert_x509 = 251 scoped_refptr<net::X509Certificate> cert_x509 =
252 net::X509Certificate::CreateFromBytes(cert_der.data(), cert_der.size()); 252 net::X509Certificate::CreateFromBytes(cert_der.data(), cert_der.size());
253 if (!cert_x509) 253 if (!cert_x509.get())
254 return RespondNow(Error(kErrorInvalidX509Cert)); 254 return RespondNow(Error(kErrorInvalidX509Cert));
255 255
256 chromeos::platform_keys::RemoveCertificate( 256 chromeos::platform_keys::RemoveCertificate(
257 platform_keys_token_id, 257 platform_keys_token_id,
258 cert_x509, 258 cert_x509,
259 base::Bind(&EnterprisePlatformKeysRemoveCertificateFunction:: 259 base::Bind(&EnterprisePlatformKeysRemoveCertificateFunction::
260 OnRemovedCertificate, 260 OnRemovedCertificate,
261 this), 261 this),
262 browser_context()); 262 browser_context());
263 return RespondLater(); 263 return RespondLater();
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 Respond(Error(kErrorInternal)); 306 Respond(Error(kErrorInternal));
307 return; 307 return;
308 } 308 }
309 token_ids.push_back(token_id); 309 token_ids.push_back(token_id);
310 } 310 }
311 311
312 Respond(ArgumentList(api_epki::GetTokens::Results::Create(token_ids))); 312 Respond(ArgumentList(api_epki::GetTokens::Results::Create(token_ids)));
313 } 313 }
314 314
315 } // namespace extensions 315 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698