Remove ScopedVector in //components/dom_distiller/

components/dom_distiller/standalone/content_extractor_browsertest.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 <stddef.h>
 #include <sstream>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/id_map.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
@@ skipping 218 matching lines @@
     viewer_handle_ =
         service->ViewUrl(this,
                          service->CreateDefaultDistillerPage(render_view_size),
                          url_);
   }
 
   DistilledArticleProto GetArticleCopy() {
     return *article_proto_;
   }
 
-  static ScopedVector<ContentExtractionRequest> CreateForCommandLine(
-      const base::CommandLine& command_line,
-      FileToUrlMap* file_to_url_map) {
-    ScopedVector<ContentExtractionRequest> requests;
+  static std::vector<std::unique_ptr<ContentExtractionRequest>>
+  CreateForCommandLine(const base::CommandLine& command_line,
+                       FileToUrlMap* file_to_url_map) {
+    std::vector<std::unique_ptr<ContentExtractionRequest>> requests;
     if (command_line.HasSwitch(kUrlSwitch)) {
       GURL url;
       std::string url_string = command_line.GetSwitchValueASCII(kUrlSwitch);
       url = GURL(url_string);
       if (url.is_valid()) {
-        requests.push_back(new ContentExtractionRequest(url));
+        requests.push_back(base::WrapUnique(new ContentExtractionRequest(url)));

[ke.he, 2017/03/01 02:58:27]

we use "base::WrapUnique" instead of "base::MakeUnique" because the constructor
of "ContentExtractionRequest" is private.

         if (command_line.HasSwitch(kOriginalUrl)) {
           (*file_to_url_map)[url.spec()] =
               command_line.GetSwitchValueASCII(kOriginalUrl);
         }
       }
     } else if (command_line.HasSwitch(kUrlsSwitch)) {
       std::string urls_string = command_line.GetSwitchValueASCII(kUrlsSwitch);
       std::vector<std::string> urls = base::SplitString(
           urls_string, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
       // Check for original-urls switch, which must exactly pair up with
       // |kUrlsSwitch| i.e. number of original urls must be same as that of
       // urls.
       std::vector<std::string> original_urls;
       if (command_line.HasSwitch(kOriginalUrls)) {
         std::string original_urls_string =
             command_line.GetSwitchValueASCII(kOriginalUrls);
         original_urls = base::SplitString(
             original_urls_string, " ",
             base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
         if (original_urls.size() != urls.size())
           original_urls.clear();
       }
       for (size_t i = 0; i < urls.size(); ++i) {
         GURL url(urls[i]);
         if (url.is_valid()) {
-          requests.push_back(new ContentExtractionRequest(url));
+          requests.push_back(
+              base::WrapUnique(new ContentExtractionRequest(url)));
           // Only regard non-empty original urls.
           if (!original_urls.empty() && !original_urls[i].empty()) {
               (*file_to_url_map)[url.spec()] = original_urls[i];
           }
         } else {
           ADD_FAILURE() << "Bad url";
         }
       }
     }
     if (requests.empty()) {
@@ skipping 127 matching lines @@
   }
 
   size_t pending_tasks_;
   size_t max_tasks_;
   size_t next_request_;
 
   base::ScopedTempDir db_dir_;
   std::unique_ptr<net::ScopedDefaultHostResolverProc>
       mock_host_resolver_override_;
   std::unique_ptr<DomDistillerService> service_;
-  ScopedVector<ContentExtractionRequest> requests_;
+  std::vector<std::unique_ptr<ContentExtractionRequest>> requests_;
 
   std::string output_data_;
   std::unique_ptr<google::protobuf::io::StringOutputStream>
       protobuf_output_stream_;
 };
 
 IN_PROC_BROWSER_TEST_F(ContentExtractor, MANUAL_ExtractUrl) {
   SetDistillerJavaScriptWorldId(content::ISOLATED_WORLD_ID_CONTENT_END);
   Start();
   base::RunLoop().Run();
 }
 
 }  // namespace dom_distiller