Remove ScopedVector from base::JSONValueConverter

google_apis/drive/drive_api_parser.h

 // Copyright (c) 2012 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 GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_
 #define GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"

[hidehiko, 2017/01/10 06:44:36]

Could you remove?

[leonhsl(Using Gerrit), 2017/01/10 09:48:13]

Done.
And added '#include "base/memory/scoped_vector.h"' explicitly into
drive_api_requests.h, which was including implicitly via this file. I'll remove
ScopedVector from google_apis/ with a follow-up CL.

 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
 #include "url/gurl.h"
 
 namespace base {
 class Value;
 template <class StructType>
 class JSONValueConverter;
 
 namespace internal {
@@ skipping 154 matching lines @@
 
   // Returns whether this application is removable by apps.delete API.
   bool is_removable() const { return removable_; }
 
   // Returns the create URL, i.e., the URL for opening a new file by the app.
   const GURL& create_url() const { return create_url_; }
 
   // List of primary mime types supported by this WebApp. Primary status should
   // trigger this WebApp becoming the default handler of file instances that
   // have these mime types.
-  const ScopedVector<std::string>& primary_mimetypes() const {
+  const std::vector<std::unique_ptr<std::string>>& primary_mimetypes() const {
     return primary_mimetypes_;
   }
 
   // List of secondary mime types supported by this WebApp. Secondary status
   // should make this WebApp show up in "Open with..." pop-up menu of the
   // default action menu for file with matching mime types.
-  const ScopedVector<std::string>& secondary_mimetypes() const {
+  const std::vector<std::unique_ptr<std::string>>& secondary_mimetypes() const {
     return secondary_mimetypes_;
   }
 
   // List of primary file extensions supported by this WebApp. Primary status
   // should trigger this WebApp becoming the default handler of file instances
   // that match these extensions.
-  const ScopedVector<std::string>& primary_file_extensions() const {
+  const std::vector<std::unique_ptr<std::string>>& primary_file_extensions()
+      const {
     return primary_file_extensions_;
   }
 
   // List of secondary file extensions supported by this WebApp. Secondary
   // status should make this WebApp show up in "Open with..." pop-up menu of the
   // default action menu for file with matching extensions.
-  const ScopedVector<std::string>& secondary_file_extensions() const {
+  const std::vector<std::unique_ptr<std::string>>& secondary_file_extensions()
+      const {
     return secondary_file_extensions_;
   }
 
   // Returns Icons for this application.  An application can have multiple
   // icons for different purpose (application, document, shared document)
   // in several sizes.
-  const ScopedVector<DriveAppIcon>& icons() const {
+  const std::vector<std::unique_ptr<DriveAppIcon>>& icons() const {
     return icons_;
   }
 
   void set_application_id(const std::string& application_id) {
     application_id_ = application_id;
   }
   void set_name(const std::string& name) { name_ = name; }
   void set_object_type(const std::string& object_type) {
     object_type_ = object_type;
   }
   void set_product_id(const std::string& id) { product_id_ = id; }
   void set_supports_create(bool supports_create) {
     supports_create_ = supports_create;
   }
   void set_removable(bool removable) { removable_ = removable; }
   void set_primary_mimetypes(
-      ScopedVector<std::string> primary_mimetypes) {
+      std::vector<std::unique_ptr<std::string>> primary_mimetypes) {
     primary_mimetypes_ = std::move(primary_mimetypes);
   }
   void set_secondary_mimetypes(
-      ScopedVector<std::string> secondary_mimetypes) {
+      std::vector<std::unique_ptr<std::string>> secondary_mimetypes) {
     secondary_mimetypes_ = std::move(secondary_mimetypes);
   }
   void set_primary_file_extensions(
-      ScopedVector<std::string> primary_file_extensions) {
+      std::vector<std::unique_ptr<std::string>> primary_file_extensions) {
     primary_file_extensions_ = std::move(primary_file_extensions);
   }
   void set_secondary_file_extensions(
-      ScopedVector<std::string> secondary_file_extensions) {
+      std::vector<std::unique_ptr<std::string>> secondary_file_extensions) {
     secondary_file_extensions_ = std::move(secondary_file_extensions);
   }
-  void set_icons(ScopedVector<DriveAppIcon> icons) {
+  void set_icons(std::vector<std::unique_ptr<DriveAppIcon>> icons) {
     icons_ = std::move(icons);
   }
   void set_create_url(const GURL& url) {
     create_url_ = url;
   }
 
  private:
   friend class base::internal::RepeatedMessageConverter<AppResource>;
   friend class AppList;
 
   // Parses and initializes data members from content of |value|.
   // Return false if parsing fails.
   bool Parse(const base::Value& value);
 
   std::string application_id_;
   std::string name_;
   std::string object_type_;
   std::string product_id_;
   bool supports_create_;
   bool removable_;
   GURL create_url_;
-  ScopedVector<std::string> primary_mimetypes_;
-  ScopedVector<std::string> secondary_mimetypes_;
-  ScopedVector<std::string> primary_file_extensions_;
-  ScopedVector<std::string> secondary_file_extensions_;
-  ScopedVector<DriveAppIcon> icons_;
+  std::vector<std::unique_ptr<std::string>> primary_mimetypes_;
+  std::vector<std::unique_ptr<std::string>> secondary_mimetypes_;
+  std::vector<std::unique_ptr<std::string>> primary_file_extensions_;
+  std::vector<std::unique_ptr<std::string>> secondary_file_extensions_;
+  std::vector<std::unique_ptr<DriveAppIcon>> icons_;
 
   DISALLOW_COPY_AND_ASSIGN(AppResource);
 };
 
 // AppList represents a list of Drive Applications.
 // https://developers.google.com/drive/v2/reference/apps/list
 class AppList {
  public:
   AppList();
   ~AppList();
 
   // Registers the mapping between JSON field names and the members in this
   // class.
   static void RegisterJSONConverter(
       base::JSONValueConverter<AppList>* converter);
 
   // Creates app list from parsed JSON.
   static std::unique_ptr<AppList> CreateFrom(const base::Value& value);
 
   // ETag for this resource.
   const std::string& etag() const { return etag_; }
 
   // Returns a vector of applications.
-  const ScopedVector<AppResource>& items() const { return items_; }
+  const std::vector<std::unique_ptr<AppResource>>& items() const {
+    return items_;
+  }
 
   void set_etag(const std::string& etag) {
     etag_ = etag;
   }
-  void set_items(ScopedVector<AppResource> items) { items_ = std::move(items); }
+  void set_items(std::vector<std::unique_ptr<AppResource>> items) {
+    items_ = std::move(items);
+  }
 
  private:
   friend class DriveAPIParserTest;
   FRIEND_TEST_ALL_PREFIXES(DriveAPIParserTest, AppListParser);
 
   // Parses and initializes data members from content of |value|.
   // Return false if parsing fails.
   bool Parse(const base::Value& value);
 
   std::string etag_;
-  ScopedVector<AppResource> items_;
+  std::vector<std::unique_ptr<AppResource>> items_;
 
   DISALLOW_COPY_AND_ASSIGN(AppList);
 };
 
 // ParentReference represents a directory.
 // https://developers.google.com/drive/v2/reference/parents
 class ParentReference {
  public:
   ParentReference();
   ~ParentReference();
@@ skipping 277 matching lines @@
   static bool HasFileListKind(const base::Value& value);
 
   // Creates file list from parsed JSON.
   static std::unique_ptr<FileList> CreateFrom(const base::Value& value);
 
   // Returns a link to the next page of files.  The URL includes the next page
   // token.
   const GURL& next_link() const { return next_link_; }
 
   // Returns a set of files in this list.
-  const ScopedVector<FileResource>& items() const { return items_; }
-  ScopedVector<FileResource>* mutable_items() { return &items_; }
+  const std::vector<std::unique_ptr<FileResource>>& items() const {
+    return items_;
+  }
+  std::vector<std::unique_ptr<FileResource>>* mutable_items() {
+    return &items_;
+  }
 
   void set_next_link(const GURL& next_link) {
     next_link_ = next_link;
   }
 
  private:
   friend class DriveAPIParserTest;
   FRIEND_TEST_ALL_PREFIXES(DriveAPIParserTest, FileListParser);
 
   // Parses and initializes data members from content of |value|.
   // Return false if parsing fails.
   bool Parse(const base::Value& value);
 
   GURL next_link_;
-  ScopedVector<FileResource> items_;
+  std::vector<std::unique_ptr<FileResource>> items_;
 
   DISALLOW_COPY_AND_ASSIGN(FileList);
 };
 
 // ChangeResource represents a change in a file.
 // https://developers.google.com/drive/v2/reference/changes
 class ChangeResource {
  public:
   ChangeResource();
   ~ChangeResource();
@@ skipping 71 matching lines @@
   static std::unique_ptr<ChangeList> CreateFrom(const base::Value& value);
 
   // Returns a link to the next page of files.  The URL includes the next page
   // token.
   const GURL& next_link() const { return next_link_; }
 
   // Returns the largest change ID number.
   int64_t largest_change_id() const { return largest_change_id_; }
 
   // Returns a set of changes in this list.
-  const ScopedVector<ChangeResource>& items() const { return items_; }
-  ScopedVector<ChangeResource>* mutable_items() { return &items_; }
+  const std::vector<std::unique_ptr<ChangeResource>>& items() const {
+    return items_;
+  }
+  std::vector<std::unique_ptr<ChangeResource>>* mutable_items() {
+    return &items_;
+  }
 
   void set_next_link(const GURL& next_link) {
     next_link_ = next_link;
   }
   void set_largest_change_id(int64_t largest_change_id) {
     largest_change_id_ = largest_change_id;
   }
 
  private:
   friend class DriveAPIParserTest;
   FRIEND_TEST_ALL_PREFIXES(DriveAPIParserTest, ChangeListParser);
 
   // Parses and initializes data members from content of |value|.
   // Return false if parsing fails.
   bool Parse(const base::Value& value);
 
   GURL next_link_;
   int64_t largest_change_id_;
-  ScopedVector<ChangeResource> items_;
+  std::vector<std::unique_ptr<ChangeResource>> items_;
 
   DISALLOW_COPY_AND_ASSIGN(ChangeList);
 };
 
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_