Remove ScopedVector in //components/dom_distiller/

components/dom_distiller/core/distiller.h

 // Copyright 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.
 
 #ifndef COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 #define COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <string>
+#include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "components/dom_distiller/core/article_distillation_update.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/distiller_url_fetcher.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 namespace dom_distiller {
 
@@ skipping 60 matching lines @@
   // as page numbers relative to the page number where distillation started.
   // E.g. if distillation starts at page 2 for a 3 page article. The relative
   // page numbers assigned to pages will be [-1,0,1].
 
   // Class representing the state of a page under distillation.
   struct DistilledPageData {
     DistilledPageData();
     virtual ~DistilledPageData();
     // Relative page number of the page.
     int page_num;
-    ScopedVector<DistillerURLFetcher> image_fetchers_;
+    std::vector<std::unique_ptr<DistillerURLFetcher>> image_fetchers_;
     scoped_refptr<base::RefCountedData<DistilledPageProto> >
         distilled_page_proto;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(DistilledPageData);
   };
 
   void OnFetchImageDone(int page_num,
                         DistillerURLFetcher* url_fetcher,
                         const std::string& id,
@@ skipping 45 matching lines @@
   const DistillerURLFetcherFactory& distiller_url_fetcher_factory_;
   std::unique_ptr<DistillerPage> distiller_page_;
 
   dom_distiller::proto::DomDistillerOptions dom_distiller_options_;
   DistillationFinishedCallback finished_cb_;
   DistillationUpdateCallback update_cb_;
 
   // Set of pages that are under distillation or have finished distillation.
   // |started_pages_index_| and |finished_pages_index_| maintains the mapping
   // from page number to the indices in |pages_|.
-  ScopedVector<DistilledPageData> pages_;
+  std::vector<std::unique_ptr<DistilledPageData>> pages_;
 
   // Maps page numbers of finished pages to the indices in |pages_|.
   std::map<int, size_t> finished_pages_index_;
 
   // Maps page numbers of pages under distillation to the indices in |pages_|.
   // If a page is |started_pages_| that means it is still waiting for an action
   // (distillation or image fetch) to finish.
   base::hash_map<int, size_t> started_pages_index_;
 
   // The list of pages that are still waiting for distillation to start.
@@ skipping 10 matching lines @@
   bool destruction_allowed_;
 
   base::WeakPtrFactory<DistillerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DistillerImpl);
 };
 
 }  // namespace dom_distiller
 
 #endif  // COMPONENTS_DOM_DISTILLER_CORE_DISTILLER_H_