Simplify ScopedVector<scoped_ptr<T>> to ScopedVector<T>.

tools/gn/loader.cc

 // Copyright (c) 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.
 
 #include "tools/gn/loader.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "tools/gn/build_settings.h"
@@ skipping 247 matching lines @@
 
   Err err;
   root->Execute(&our_scope, &err);
   if (err.has_error())
     g_scheduler->FailWithError(err);
 
   if (!our_scope.CheckForUnusedVars(&err))
     g_scheduler->FailWithError(err);
 
   // Pass all of the items that were defined off to the builder.
-  for (const auto& item : collected_items)
-    settings->build_settings()->ItemDefined(item->Pass());
+  for (auto& item : collected_items) {
+    settings->build_settings()->ItemDefined(make_scoped_ptr(item));

[dcheng, 2014/10/15 20:26:09]

This is a bit awkward, but I don't know of a better solution without
std::unique_ptr. Maybe cc's ScopedPtrVector will help here.

+    item = nullptr;
+  }
 
   trace.Done();
 
   main_loop_->PostTask(FROM_HERE, base::Bind(&LoaderImpl::DidLoadFile, this));
 }
 
 void LoaderImpl::BackgroundLoadBuildConfig(
     Settings* settings,
     const Scope::KeyValueMap& toolchain_overrides,
     const ParseNode* root) {
@@ skipping 129 matching lines @@
     const SourceFile& file_name,
     const base::Callback<void(const ParseNode*)>& callback,
     Err* err) {
   if (async_load_file_.is_null()) {
     return g_scheduler->input_file_manager()->AsyncLoadFile(
         origin, build_settings, file_name, callback, err);
   }
   return async_load_file_.Run(
       origin, build_settings, file_name, callback, err);
 }