Remove ScopedVector from content/renderer/.

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>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
 #include "content/grit/content_resources.h"
 #include "content/public/common/content_client.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/resource_fetcher.h"
 #include "content/renderer/mojo_bindings_controller.h"
 #include "content/renderer/mojo_main_runner.h"
 #include "gin/converter.h"
@@ skipping 151 matching lines @@
   }
 }
 
 void MojoContextState::FetchModule(const std::string& id) {
   const GURL url(module_prefix_ + id);
   // TODO(sky): better error checks here?
   DCHECK(url.is_valid() && !url.is_empty());
   DCHECK(fetched_modules_.find(id) == fetched_modules_.end());
   fetched_modules_.insert(id);
   ResourceFetcher* fetcher = ResourceFetcher::Create(url);
-  module_fetchers_.push_back(fetcher);
+  module_fetchers_.push_back(base::WrapUnique(fetcher));
   fetcher->Start(frame_,
                  blink::WebURLRequest::RequestContextScript,
                  base::Bind(&MojoContextState::OnFetchModuleComplete,
                             base::Unretained(this), fetcher, id));
 }
 
 void MojoContextState::OnFetchModuleComplete(
     ResourceFetcher* fetcher,
     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.
-  std::unique_ptr<ResourceFetcher> deleter(fetcher);
-  module_fetchers_.weak_erase(
-      std::find(module_fetchers_.begin(), module_fetchers_.end(), fetcher));
+  auto iter =
+      std::find_if(module_fetchers_.begin(), module_fetchers_.end(),
+                   [fetcher](const std::unique_ptr<ResourceFetcher>& item) {
+                     return item.get() == fetcher;
+                   });
+  std::unique_ptr<ResourceFetcher> deleter = std::move(*iter);
+  module_fetchers_.erase(iter);
+
   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