Convert //google_apis from scoped_ptr to std::unique_ptr

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
 #include <stdint.h>
+
 #include <cstddef>
 #include <cstdio>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_file.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/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "google_apis/gcm/base/fake_encryptor.h"
@@ skipping 103 matching lines @@
             << " Message send status: " << status;
 }
 
 // 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_;
 };
 
 // A cert verifier that access all certificates.
 class MyTestCertVerifier : public net::CertVerifier {
  public:
   MyTestCertVerifier() {}
   ~MyTestCertVerifier() override {}
 
   int Verify(net::X509Certificate* cert,
              const std::string& hostname,
              const std::string& ocsp_response,
              int flags,
              net::CRLSet* crl_set,
              net::CertVerifyResult* verify_result,
              const net::CompletionCallback& callback,
-             scoped_ptr<Request>* out_req,
+             std::unique_ptr<Request>* out_req,
              const net::BoundNetLog& net_log) override {
     return net::OK;
   }
 };
 
 class MCSProbeAuthPreferences : public net::HttpAuthPreferences {
  public:
   MCSProbeAuthPreferences()
       : HttpAuthPreferences(std::vector<std::string>()
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
@@ skipping 23 matching lines @@
   void Start();
 
   uint64_t android_id() const { return android_id_; }
   uint64_t secret() const { return secret_; }
 
  private:
   void CheckIn();
   void InitializeNetworkState();
   void BuildNetworkSession();
 
-  void LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result);
+  void LoadCallback(std::unique_ptr<GCMStore::LoadResult> load_result);
   void UpdateCallback(bool success);
   void ErrorCallback();
   void OnCheckInCompleted(
       const checkin_proto::AndroidCheckinResponse& checkin_response);
   void StartMCSLogin();
 
   base::DefaultClock clock_;
 
   base::CommandLine command_line_;
 
   base::FilePath gcm_store_path_;
   uint64_t android_id_;
   uint64_t secret_;
   std::string server_host_;
   int server_port_;
 
   // Network state.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   net::NetLog net_log_;
-  scoped_ptr<net::WriteToFileNetLogObserver> logger_;
-  scoped_ptr<net::HostResolver> host_resolver_;
-  scoped_ptr<net::CertVerifier> cert_verifier_;
-  scoped_ptr<net::ChannelIDService> system_channel_id_service_;
-  scoped_ptr<net::TransportSecurityState> transport_security_state_;
+  std::unique_ptr<net::WriteToFileNetLogObserver> logger_;
+  std::unique_ptr<net::HostResolver> host_resolver_;
+  std::unique_ptr<net::CertVerifier> cert_verifier_;
+  std::unique_ptr<net::ChannelIDService> system_channel_id_service_;
+  std::unique_ptr<net::TransportSecurityState> transport_security_state_;
   MCSProbeAuthPreferences http_auth_preferences_;
-  scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory_;
-  scoped_ptr<net::HttpServerPropertiesImpl> http_server_properties_;
-  scoped_ptr<net::HostMappingRules> host_mapping_rules_;
-  scoped_ptr<net::HttpNetworkSession> network_session_;
-  scoped_ptr<net::ProxyService> proxy_service_;
+  std::unique_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory_;
+  std::unique_ptr<net::HttpServerPropertiesImpl> http_server_properties_;
+  std::unique_ptr<net::HostMappingRules> host_mapping_rules_;
+  std::unique_ptr<net::HttpNetworkSession> network_session_;
+  std::unique_ptr<net::ProxyService> proxy_service_;
 
   FakeGCMStatsRecorder recorder_;
-  scoped_ptr<GCMStore> gcm_store_;
-  scoped_ptr<MCSClient> mcs_client_;
-  scoped_ptr<CheckinRequest> checkin_request_;
+  std::unique_ptr<GCMStore> gcm_store_;
+  std::unique_ptr<MCSClient> mcs_client_;
+  std::unique_ptr<CheckinRequest> checkin_request_;
 
-  scoped_ptr<ConnectionFactoryImpl> connection_factory_;
+  std::unique_ptr<ConnectionFactoryImpl> connection_factory_;
 
   base::Thread file_thread_;
 
-  scoped_ptr<base::RunLoop> run_loop_;
+  std::unique_ptr<base::RunLoop> run_loop_;
 };
 
 MCSProbe::MCSProbe(
     const base::CommandLine& command_line,
     scoped_refptr<net::URLRequestContextGetter> url_request_context_getter)
     : command_line_(command_line),
       gcm_store_path_(base::FilePath(FILE_PATH_LITERAL("gcm_store"))),
       android_id_(0),
       secret_(0),
       server_port_(0),
@@ skipping 36 matching lines @@
                                    net::HostPortPair(server_host_,
                                                      server_port_).ToString()));
   connection_factory_.reset(
       new ConnectionFactoryImpl(endpoints,
                                 kDefaultBackoffPolicy,
                                 network_session_.get(),
                                 NULL,
                                 &net_log_,
                                 &recorder_));
   gcm_store_.reset(
-      new GCMStoreImpl(gcm_store_path_,
-                       file_thread_.task_runner(),
-                       make_scoped_ptr<Encryptor>(new FakeEncryptor)));
+      new GCMStoreImpl(gcm_store_path_, file_thread_.task_runner(),
+                       base::WrapUnique<Encryptor>(new FakeEncryptor)));
   mcs_client_.reset(new MCSClient("probe",
                                   &clock_,
                                   connection_factory_.get(),
                                   gcm_store_.get(),
                                   &recorder_));
   run_loop_.reset(new base::RunLoop());
   gcm_store_->Load(GCMStore::CREATE_IF_MISSING,
                    base::Bind(&MCSProbe::LoadCallback,
                               base::Unretained(this)));
   run_loop_->Run();
 }
 
-void MCSProbe::LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result) {
+void MCSProbe::LoadCallback(std::unique_ptr<GCMStore::LoadResult> load_result) {
   DCHECK(load_result->success);
   if (android_id_ != 0 && secret_ != 0) {
     DVLOG(1) << "Presetting MCS id " << android_id_;
     load_result->device_android_id = android_id_;
     load_result->device_security_token = secret_;
     gcm_store_->SetDeviceCredentials(android_id_,
                                      secret_,
                                      base::Bind(&MCSProbe::UpdateCallback,
                                                 base::Unretained(this)));
   } else {
@@ skipping 159 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }