Convert //content/renderer from scoped_ptr to std::unique_ptr

content/renderer/mojo_context_state.cc

 // Copyright 2014 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 "content/renderer/mojo_context_state.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
@@ skipping 34 matching lines @@
              v8::Local<v8::Value> module) {
   v8::Isolate* isolate = runner->GetContextHolder()->isolate();
   v8::Local<v8::Function> start;
   CHECK(gin::ConvertFromV8(isolate, module, &start));
   runner->Call(start, runner->global(), 0, NULL);
 }
 
 using ModuleSourceMap =
     std::map<std::string, scoped_refptr<base::RefCountedMemory>>;
 
-base::LazyInstance<scoped_ptr<ModuleSourceMap>>::Leaky g_module_sources;
+base::LazyInstance<std::unique_ptr<ModuleSourceMap>>::Leaky g_module_sources;
 
 scoped_refptr<base::RefCountedMemory> GetBuiltinModuleData(
     const std::string& path) {
   static const struct {
     const char* path;
     const int id;
   } kBuiltinModuleResources[] = {
     { mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS },
     { mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS },
     { mojo::kCodecModuleName, IDR_MOJO_CODEC_JS },
     { mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS },
     { mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS },
     { mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS },
     { mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS },
     { mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS },
   };
 
-  scoped_ptr<ModuleSourceMap>& module_sources = g_module_sources.Get();
+  std::unique_ptr<ModuleSourceMap>& module_sources = g_module_sources.Get();
   if (!module_sources) {
     // Initialize the module source map on first access.
     module_sources.reset(new ModuleSourceMap);
     for (size_t i = 0; i < arraysize(kBuiltinModuleResources); ++i) {
       const auto& resource = kBuiltinModuleResources[i];
       scoped_refptr<base::RefCountedMemory> data =
           GetContentClient()->GetDataResourceBytes(resource.id);
       DCHECK_GT(data->size(), 0u);
       module_sources->insert(std::make_pair(std::string(resource.path), data));
     }
@@ skipping 95 matching lines @@
     const std::string& id,
     const blink::WebURLResponse& response,
     const std::string& data) {
   if (response.isNull()) {
     LOG(ERROR) << "Failed to fetch source for module \"" << id << "\"";
     return;
   }
   DCHECK_EQ(module_prefix_ + id, response.url().string().utf8());
   // We can't delete fetch right now as the arguments to this function come from
   // it and are used below. Instead use a scope_ptr to cleanup.
-  scoped_ptr<ResourceFetcher> deleter(fetcher);
+  std::unique_ptr<ResourceFetcher> deleter(fetcher);
   module_fetchers_.weak_erase(
       std::find(module_fetchers_.begin(), module_fetchers_.end(), fetcher));
   if (data.empty()) {
     LOG(ERROR) << "Fetched empty source for module \"" << id << "\"";
     return;
   }
 
   runner_->Run(data, id);
 }
 
 void MojoContextState::OnDidAddPendingModule(
     const std::string& id,
     const std::vector<std::string>& dependencies) {
   FetchModules(dependencies);
 
   gin::ContextHolder* context_holder = runner_->GetContextHolder();
   gin::ModuleRegistry* registry = gin::ModuleRegistry::From(
       context_holder->context());
   registry->AttemptToLoadMoreModules(context_holder->isolate());
 }
 
 }  // namespace content