commit 9cdf9d702ec18191d9b34018ba2a56f6f8091af9
author olli.raula <olli.raula@intel.com> Thu Dec 10 14:24:29 2015
committer Commit bot <commit-bot@chromium.org> Thu Dec 10 14:25:13 2015
tree 088fdd81b9f0151611a28a115ecac44a0511ab9b
parent 02c160df3870631774a336443e192e52a6010090

Remove ScopedVector from host_resolver_impl_unittest.cc

BUG=554289

Review URL: https://codereview.chromium.org/1511143003

Cr-Commit-Position: refs/heads/master@{#364352}

net/dns/host_resolver_impl_unittest.cc

diff --git a/net/dns/host_resolver_impl_unittest.cc b/net/dns/host_resolver_impl_unittest.cc
index 36811805..aa379a03 100644
--- a/net/dns/host_resolver_impl_unittest.cc
+++ b/net/dns/host_resolver_impl_unittest.cc
@@ -7,12 +7,13 @@
 #include <algorithm>
 #include <string>
 #include <tuple>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ -481,7 +482,7 @@
     Request* CreateRequest(const std::string& hostname) {
       return test->CreateRequest(hostname);
     }
-    ScopedVector<Request>& requests() { return test->requests_; }
+    std::vector<scoped_ptr<Request>>& requests() { return test->requests_; }
 
     void DeleteResolver() { test->resolver_.reset(); }
 
@@ -510,10 +511,9 @@
   // not start until released by |proc_->SignalXXX|.
   Request* CreateRequest(const HostResolver::RequestInfo& info,
                          RequestPriority priority) {
-    Request* req = new Request(
-        info, priority, requests_.size(), resolver_.get(), handler_.get());
-    requests_.push_back(req);
-    return req;
+    requests_.push_back(make_scoped_ptr(new Request(
+        info, priority, requests_.size(), resolver_.get(), handler_.get())));
+    return requests_.back().get();
   }
 
   Request* CreateRequest(const std::string& hostname,
@@ -565,7 +565,7 @@
 
   scoped_refptr<MockHostResolverProc> proc_;
   scoped_ptr<HostResolverImpl> resolver_;
-  ScopedVector<Request> requests_;
+  std::vector<scoped_ptr<Request>> requests_;
 
   scoped_ptr<Handler> handler_;
 };