components/autofill: scoped_ptr -> unique_ptr

components/autofill/core/browser/webdata/autocomplete_syncable_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/webdata/autocomplete_syncable_service.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/location.h"
@@ skipping 83 matching lines @@
 }
 
 void AutocompleteSyncableService::InjectStartSyncFlare(
     const syncer::SyncableService::StartSyncFlare& flare) {
   flare_ = flare;
 }
 
 syncer::SyncMergeResult AutocompleteSyncableService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
-    scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
-    scoped_ptr<syncer::SyncErrorFactory> error_handler) {
+    std::unique_ptr<syncer::SyncChangeProcessor> sync_processor,
+    std::unique_ptr<syncer::SyncErrorFactory> error_handler) {
   DCHECK(CalledOnValidThread());
   DCHECK(!sync_processor_);
   DCHECK(sync_processor);
   DCHECK(error_handler);
 
   syncer::SyncMergeResult merge_result(type);
   error_handler_ = std::move(error_handler);
   std::vector<AutofillEntry> entries;
   if (!LoadAutofillData(&entries)) {
     merge_result.set_error(error_handler_->CreateAndUploadError(
@@ skipping 80 matching lines @@
   if (!sync_processor_) {
     syncer::SyncError error(FROM_HERE,
                             syncer::SyncError::DATATYPE_ERROR,
                             "Models not yet associated.",
                             syncer::AUTOFILL);
     return error;
   }
 
   // Data is loaded only if we get new ADD/UPDATE change.
   std::vector<AutofillEntry> entries;
-  scoped_ptr<AutocompleteEntryMap> db_entries;
+  std::unique_ptr<AutocompleteEntryMap> db_entries;
   std::vector<AutofillEntry> new_entries;
 
   syncer::SyncError list_processing_error;
 
   for (const auto& i : change_list) {
     DCHECK(i.IsValid());
     switch (i.change_type()) {
       case syncer::SyncChange::ACTION_ADD:
       case syncer::SyncChange::ACTION_UPDATE:
         if (!db_entries) {
@@ skipping 200 matching lines @@
 }
 
 // static
 std::string AutocompleteSyncableService::KeyToTag(const std::string& name,
                                                   const std::string& value) {
   std::string prefix(kAutofillEntryNamespaceTag);
   return prefix + net::EscapePath(name) + "|" + net::EscapePath(value);
 }
 
 }  // namespace autofill