Convert //sync from scoped_ptr to std::unique_ptr

sync/tools/sync_client.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 <stdint.h>
+
 #include <cstddef>
 #include <cstdio>
+#include <memory>
 #include <string>
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "components/invalidation/impl/non_blocking_invalidator.h"
 #include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/sync_driver/invalidation_helper.h"
 #include "jingle/notifier/base/notification_method.h"
@@ skipping 41 matching lines @@
     "xmpp-allow-insecure-connection";
 const char kSyncServiceURL[] = "https://clients4.google.com/chrome-sync/dev";
 
 // Needed to use a real host resolver.
 class MyTestURLRequestContext : public net::TestURLRequestContext {
  public:
   MyTestURLRequestContext() : TestURLRequestContext(true) {
     context_storage_.set_host_resolver(
         net::HostResolver::CreateDefaultResolver(NULL));
     context_storage_.set_transport_security_state(
-        make_scoped_ptr(new net::TransportSecurityState()));
+        base::WrapUnique(new net::TransportSecurityState()));
     Init();
   }
 
   ~MyTestURLRequestContext() override {}
 };
 
 class MyTestURLRequestContextGetter : public net::TestURLRequestContextGetter {
  public:
   explicit MyTestURLRequestContextGetter(
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner)
       : TestURLRequestContextGetter(io_task_runner) {}
 
   net::TestURLRequestContext* GetURLRequestContext() override {
     // Construct |context_| lazily so it gets constructed on the right
     // thread (the IO thread).
     if (!context_)
       context_.reset(new MyTestURLRequestContext());
     return context_.get();
   }
 
  private:
   ~MyTestURLRequestContextGetter() override {}
 
-  scoped_ptr<MyTestURLRequestContext> context_;
+  std::unique_ptr<MyTestURLRequestContext> context_;
 };
 
 // TODO(akalin): Use system encryptor once it's moved to sync/.
 class NullEncryptor : public Encryptor {
  public:
   ~NullEncryptor() override {}
 
   bool EncryptString(const std::string& plaintext,
                      std::string* ciphertext) override {
     *ciphertext = plaintext;
@@ skipping 20 matching lines @@
   void OnChangesApplied(ModelType model_type,
                         int64_t model_version,
                         const BaseTransaction* trans,
                         const ImmutableChangeRecordList& changes) override {
     LOG(INFO) << "Changes applied for "
               << ModelTypeToString(model_type);
     size_t i = 1;
     size_t change_count = changes.Get().size();
     for (ChangeRecordList::const_iterator it =
              changes.Get().begin(); it != changes.Get().end(); ++it) {
-      scoped_ptr<base::DictionaryValue> change_value(it->ToValue());
+      std::unique_ptr<base::DictionaryValue> change_value(it->ToValue());
       LOG(INFO) << "Change (" << i << "/" << change_count << "): "
                 << ValueToString(*change_value);
       if (it->action != ChangeRecord::ACTION_DELETE) {
         ReadNode node(trans);
         CHECK_EQ(node.InitByIdLookup(it->id), BaseNode::INIT_OK);
-        scoped_ptr<base::DictionaryValue> details(node.ToValue());
+        std::unique_ptr<base::DictionaryValue> details(node.ToValue());
         VLOG(1) << "Details: " << ValueToString(*details);
       }
       ++i;
     }
   }
 
   void OnChangesComplete(ModelType model_type) override {
     LOG(INFO) << "Changes complete for "
               << ModelTypeToString(model_type);
   }
@@ skipping 69 matching lines @@
       if (!NotificationTypeToRealModelType(ids_it->name(), &type)) {
         DLOG(WARNING) << "Notification has invalid id: "
                       << syncer::ObjectIdToString(*ids_it);
       } else {
         syncer::SingleObjectInvalidationSet invalidation_set =
             invalidation_map.ForObject(*ids_it);
         for (syncer::SingleObjectInvalidationSet::const_iterator inv_it =
                  invalidation_set.begin();
              inv_it != invalidation_set.end();
              ++inv_it) {
-          scoped_ptr<syncer::InvalidationInterface> inv_adapter(
+          std::unique_ptr<syncer::InvalidationInterface> inv_adapter(
               new InvalidationAdapter(*inv_it));
           sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter));
         }
       }
     }
   }
 
   std::string GetOwnerName() const override { return "InvalidatorShim"; }
 
  private:
@@ skipping 70 matching lines @@
                 "after logging into\n"
                 "sync to get the token to pass into this utility.\n",
                 argv[0],
                 kEmailSwitch, kTokenSwitch, kXmppHostPortSwitch,
                 kXmppTrySslTcpFirstSwitch,
                 kXmppAllowInsecureConnectionSwitch);
     return -1;
   }
 
   // Set up objects that monitor the network.
-  scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
+  std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
       net::NetworkChangeNotifier::Create());
 
   // Set up sync notifier factory.
   const scoped_refptr<MyTestURLRequestContextGetter> context_getter =
       new MyTestURLRequestContextGetter(io_thread.task_runner());
   const notifier::NotifierOptions& notifier_options =
       ParseNotifierOptions(command_line, context_getter);
   syncer::NetworkChannelCreator network_channel_creator =
       syncer::NonBlockingInvalidator::MakePushClientChannelCreator(
           notifier_options);
   const char kClientInfo[] = "standalone_sync_client";
   std::string invalidator_id = base::RandBytesAsString(8);
   NullInvalidationStateTracker null_invalidation_state_tracker;
-  scoped_ptr<Invalidator> invalidator(new NonBlockingInvalidator(
-      network_channel_creator,
-      invalidator_id,
+  std::unique_ptr<Invalidator> invalidator(new NonBlockingInvalidator(
+      network_channel_creator, invalidator_id,
       null_invalidation_state_tracker.GetSavedInvalidations(),
       null_invalidation_state_tracker.GetBootstrapData(),
-      &null_invalidation_state_tracker,
-      kClientInfo,
+      &null_invalidation_state_tracker, kClientInfo,
       notifier_options.request_context_getter));
 
   // Set up database directory for the syncer.
   base::ScopedTempDir database_dir;
   CHECK(database_dir.CreateUniqueTempDir());
 
   // Developers often add types to ModelTypeSet::All() before the server
   // supports them.  We need to be explicit about which types we want here.
   ModelTypeSet model_types;
   model_types.Put(BOOKMARKS);
@@ skipping 26 matching lines @@
        it.Good(); it.Inc()) {
     routing_info[it.Get()] = GROUP_PASSIVE;
   }
   scoped_refptr<PassiveModelWorker> passive_model_safe_worker =
       new PassiveModelWorker(nullptr);
   std::vector<scoped_refptr<ModelSafeWorker> > workers;
   workers.push_back(passive_model_safe_worker);
 
   // Set up sync manager.
   SyncManagerFactory sync_manager_factory;
-  scoped_ptr<SyncManager> sync_manager =
+  std::unique_ptr<SyncManager> sync_manager =
       sync_manager_factory.CreateSyncManager("sync_client manager");
   LoggingJsEventHandler js_event_handler;
   // Used only by InitialProcessMetadata(), so it's okay to leave this as NULL.
   const scoped_refptr<base::TaskRunner> blocking_task_runner = NULL;
   const char kUserAgent[] = "sync_client";
   // TODO(akalin): Replace this with just the context getter once
   // HttpPostProviderFactory is removed.
   CancelationSignal factory_cancelation_signal;
-  scoped_ptr<HttpPostProviderFactory> post_factory(
-      new HttpBridgeFactory(context_getter.get(),
-                            base::Bind(&StubNetworkTimeUpdateCallback),
-                            &factory_cancelation_signal));
+  std::unique_ptr<HttpPostProviderFactory> post_factory(new HttpBridgeFactory(
+      context_getter.get(), base::Bind(&StubNetworkTimeUpdateCallback),
+      &factory_cancelation_signal));
   post_factory->Init(kUserAgent, BindToTrackerCallback());
   // Used only when committing bookmarks, so it's okay to leave this
   // as NULL.
   ExtensionsActivity* extensions_activity = NULL;
   LoggingChangeDelegate change_delegate;
   const char kRestoredKeyForBootstrapping[] = "";
   const char kRestoredKeystoreKeyForBootstrapping[] = "";
   NullEncryptor null_encryptor;
   InternalComponentsFactoryImpl::Switches factory_switches = {
       InternalComponentsFactory::ENCRYPTION_KEYSTORE,
@@ skipping 18 matching lines @@
       new InternalComponentsFactoryImpl(factory_switches));
   args.encryptor = &null_encryptor;
   args.unrecoverable_error_handler = WeakHandle<UnrecoverableErrorHandler>();
   args.report_unrecoverable_error_function =
       base::Bind(LogUnrecoverableErrorContext);
   args.cancelation_signal = &scm_cancelation_signal;
   sync_manager->Init(&args);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   invalidator->UpdateCredentials(credentials.email, credentials.sync_token);
-  scoped_ptr<InvalidatorShim> shim(new InvalidatorShim(sync_manager.get()));
+  std::unique_ptr<InvalidatorShim> shim(
+      new InvalidatorShim(sync_manager.get()));
   invalidator->RegisterHandler(shim.get());
   CHECK(invalidator->UpdateRegisteredIds(
       shim.get(), ModelTypeSetToObjectIdSet(model_types)));
   sync_manager->StartSyncingNormally(routing_info, base::Time());
 
   sync_loop.Run();
 
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }