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

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

Issue 2257103002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 (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 "chrome/browser/chromeos/policy/device_local_account_policy_store.h" 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_store.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 session_manager_client_->RetrieveDeviceLocalAccountPolicy( 42 session_manager_client_->RetrieveDeviceLocalAccountPolicy(
43 account_id_, 43 account_id_,
44 base::Bind(&DeviceLocalAccountPolicyStore::ValidateLoadedPolicyBlob, 44 base::Bind(&DeviceLocalAccountPolicyStore::ValidateLoadedPolicyBlob,
45 weak_factory_.GetWeakPtr())); 45 weak_factory_.GetWeakPtr()));
46 } 46 }
47 47
48 void DeviceLocalAccountPolicyStore::Store( 48 void DeviceLocalAccountPolicyStore::Store(
49 const em::PolicyFetchResponse& policy) { 49 const em::PolicyFetchResponse& policy) {
50 weak_factory_.InvalidateWeakPtrs(); 50 weak_factory_.InvalidateWeakPtrs();
51 CheckKeyAndValidate( 51 CheckKeyAndValidate(
52 true, base::WrapUnique(new em::PolicyFetchResponse(policy)), 52 true, base::MakeUnique<em::PolicyFetchResponse>(policy),
53 base::Bind(&DeviceLocalAccountPolicyStore::StoreValidatedPolicy, 53 base::Bind(&DeviceLocalAccountPolicyStore::StoreValidatedPolicy,
54 weak_factory_.GetWeakPtr())); 54 weak_factory_.GetWeakPtr()));
55 } 55 }
56 56
57 void DeviceLocalAccountPolicyStore::ValidateLoadedPolicyBlob( 57 void DeviceLocalAccountPolicyStore::ValidateLoadedPolicyBlob(
58 const std::string& policy_blob) { 58 const std::string& policy_blob) {
59 if (policy_blob.empty()) { 59 if (policy_blob.empty()) {
60 status_ = CloudPolicyStore::STATUS_LOAD_ERROR; 60 status_ = CloudPolicyStore::STATUS_LOAD_ERROR;
61 NotifyStoreError(); 61 NotifyStoreError();
62 } else { 62 } else {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 policy::BrowserPolicyConnectorChromeOS* connector = 173 policy::BrowserPolicyConnectorChromeOS* connector =
174 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 174 g_browser_process->platform_part()->browser_policy_connector_chromeos();
175 validator->ValidateSignature(key->as_string(), 175 validator->ValidateSignature(key->as_string(),
176 GetPolicyVerificationKey(), 176 GetPolicyVerificationKey(),
177 connector->GetEnterpriseDomain(), 177 connector->GetEnterpriseDomain(),
178 false); 178 false);
179 validator.release()->StartValidation(callback); 179 validator.release()->StartValidation(callback);
180 } 180 }
181 181
182 } // namespace policy 182 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698