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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_external_data_manager.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/user_cloud_external_data_manager.h" 5 #include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h"
6 6
7 #include <memory>
8
7 #include "base/location.h" 9 #include "base/location.h"
8 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/ptr_util.h"
9 #include "base/sequenced_task_runner.h" 11 #include "base/sequenced_task_runner.h"
10 #include "chrome/browser/chromeos/policy/cloud_external_data_store.h" 12 #include "chrome/browser/chromeos/policy/cloud_external_data_store.h"
11 #include "components/policy/core/common/cloud/cloud_policy_store.h" 13 #include "components/policy/core/common/cloud/cloud_policy_store.h"
12 #include "components/policy/core/common/cloud/resource_cache.h" 14 #include "components/policy/core/common/cloud/resource_cache.h"
13 15
14 namespace policy { 16 namespace policy {
15 17
16 namespace { 18 namespace {
17 19
18 const char kCacheKey[] = "data"; 20 const char kCacheKey[] = "data";
19 21
20 } // namespace 22 } // namespace
21 23
22 UserCloudExternalDataManager::UserCloudExternalDataManager( 24 UserCloudExternalDataManager::UserCloudExternalDataManager(
23 const GetChromePolicyDetailsCallback& get_policy_details, 25 const GetChromePolicyDetailsCallback& get_policy_details,
24 scoped_refptr<base::SequencedTaskRunner> backend_task_runner, 26 scoped_refptr<base::SequencedTaskRunner> backend_task_runner,
25 scoped_refptr<base::SequencedTaskRunner> io_task_runner, 27 scoped_refptr<base::SequencedTaskRunner> io_task_runner,
26 const base::FilePath& cache_path, 28 const base::FilePath& cache_path,
27 CloudPolicyStore* policy_store) 29 CloudPolicyStore* policy_store)
28 : CloudExternalDataManagerBase(get_policy_details, 30 : CloudExternalDataManagerBase(get_policy_details,
29 backend_task_runner, 31 backend_task_runner,
30 io_task_runner), 32 io_task_runner),
31 resource_cache_(new ResourceCache(cache_path, backend_task_runner)) { 33 resource_cache_(new ResourceCache(cache_path, backend_task_runner)) {
32 SetPolicyStore(policy_store); 34 SetPolicyStore(policy_store);
33 SetExternalDataStore(make_scoped_ptr(new CloudExternalDataStore( 35 SetExternalDataStore(base::WrapUnique(new CloudExternalDataStore(
34 kCacheKey, backend_task_runner, resource_cache_))); 36 kCacheKey, backend_task_runner, resource_cache_)));
35 } 37 }
36 38
37 UserCloudExternalDataManager::~UserCloudExternalDataManager() { 39 UserCloudExternalDataManager::~UserCloudExternalDataManager() {
38 SetExternalDataStore(scoped_ptr<CloudExternalDataStore>()); 40 SetExternalDataStore(std::unique_ptr<CloudExternalDataStore>());
39 backend_task_runner_->DeleteSoon(FROM_HERE, resource_cache_); 41 backend_task_runner_->DeleteSoon(FROM_HERE, resource_cache_);
40 } 42 }
41 43
42 } // namespace policy 44 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698