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

Side by Side Diff: chrome/browser/extensions/extension_sync_data.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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 (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/extensions/extension_sync_data.h" 5 #include "chrome/browser/extensions/extension_sync_data.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 linked_icons_.push_back(linked_icon); 132 linked_icons_.push_back(linked_icon);
133 } 133 }
134 } 134 }
135 } 135 }
136 136
137 ExtensionSyncData::ExtensionSyncData(const ExtensionSyncData& other) = default; 137 ExtensionSyncData::ExtensionSyncData(const ExtensionSyncData& other) = default;
138 138
139 ExtensionSyncData::~ExtensionSyncData() {} 139 ExtensionSyncData::~ExtensionSyncData() {}
140 140
141 // static 141 // static
142 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncData( 142 std::unique_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncData(
143 const syncer::SyncData& sync_data) { 143 const syncer::SyncData& sync_data) {
144 scoped_ptr<ExtensionSyncData> data(new ExtensionSyncData); 144 std::unique_ptr<ExtensionSyncData> data(new ExtensionSyncData);
145 if (data->PopulateFromSyncData(sync_data)) 145 if (data->PopulateFromSyncData(sync_data))
146 return data; 146 return data;
147 return nullptr; 147 return nullptr;
148 } 148 }
149 149
150 // static 150 // static
151 scoped_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncChange( 151 std::unique_ptr<ExtensionSyncData> ExtensionSyncData::CreateFromSyncChange(
152 const syncer::SyncChange& sync_change) { 152 const syncer::SyncChange& sync_change) {
153 scoped_ptr<ExtensionSyncData> data( 153 std::unique_ptr<ExtensionSyncData> data(
154 CreateFromSyncData(sync_change.sync_data())); 154 CreateFromSyncData(sync_change.sync_data()));
155 if (!data.get()) 155 if (!data.get())
156 return nullptr; 156 return nullptr;
157 157
158 if (sync_change.change_type() == syncer::SyncChange::ACTION_DELETE) 158 if (sync_change.change_type() == syncer::SyncChange::ACTION_DELETE)
159 data->uninstalled_ = true; 159 data->uninstalled_ = true;
160 return data; 160 return data;
161 } 161 }
162 162
163 syncer::SyncData ExtensionSyncData::GetSyncData() const { 163 syncer::SyncData ExtensionSyncData::GetSyncData() const {
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 317
318 if (entity_specifics.has_extension()) 318 if (entity_specifics.has_extension())
319 return PopulateFromExtensionSpecifics(entity_specifics.extension()); 319 return PopulateFromExtensionSpecifics(entity_specifics.extension());
320 320
321 LOG(ERROR) << "Attempt to sync bad EntitySpecifics: no extension data."; 321 LOG(ERROR) << "Attempt to sync bad EntitySpecifics: no extension data.";
322 RecordBadSyncData(NO_EXTENSION_SPECIFICS); 322 RecordBadSyncData(NO_EXTENSION_SPECIFICS);
323 return false; 323 return false;
324 } 324 }
325 325
326 } // namespace extensions 326 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_sync_data.h ('k') | chrome/browser/extensions/extension_sync_data_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698