Parse TeamDrive resource inside ChangeList.

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>
@@ skipping 732 matching lines @@
   GURL next_link_;
   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:
+  enum ChangeType {
+    UNKNOWN,  // Uninitialized state.
+    FILE,
+    TEAM_DRIVE,
+  };
   ChangeResource();
   ~ChangeResource();
 
   // Registers the mapping between JSON field names and the members in this
   // class.
   static void RegisterJSONConverter(
       base::JSONValueConverter<ChangeResource>* converter);
 
   // Creates change resource from parsed JSON.
   static std::unique_ptr<ChangeResource> CreateFrom(const base::Value& value);
 
   // Returns change ID for this change.  This is a monotonically increasing
   // number.
   int64_t change_id() const { return change_id_; }
 
+  // Returns whether this is a change of a file or a team drive.
+  ChangeType type() const { return type_; }
+
   // Returns a string file ID for corresponding file of the change.
+  // Filled only when type == FILE.

[hashimoto, 2017/03/22 06:40:30]

What does "filled" here mean?
Please use a more specific term (e.g. non-empty) to clarify.

Does it make sense to add DCHEK about the value of |type| to this function?

[yamaguchi, 2017/03/22 07:30:36]

It means uninitialized. Also added DCHECK.

   const std::string& file_id() const { return file_id_; }
 
   // Returns true if this file is deleted in the change.
   bool is_deleted() const { return deleted_; }
 
   // Returns FileResource of the file which the change refers to.
+  // Filled only when type == FILE.

[hashimoto, 2017/03/22 06:40:30]

"Filled" here is ambiguous.
If type != FILE, it's null, or FileResource w/ invalid values?

Does it make sense to add DCHECK?

[yamaguchi, 2017/03/22 07:30:36]

It'll be empty (owns nothing). Added DCHECK.

   const FileResource* file() const { return file_.get(); }
   FileResource* mutable_file() { return file_.get(); }
 
+  // Returns TeamDriveResource which the change refers to.
+  // Filled only when type == TEAM_DRIVE.

[hashimoto, 2017/03/22 06:40:30]

ditto.

[yamaguchi, 2017/03/22 07:30:36]

Done.

+  const TeamDriveResource* team_drive() const { return team_drive_.get(); }
+  TeamDriveResource* mutable_team_drive() { return team_drive_.get(); }
+
+  // Returns the ID of the Team Drive. Filled only when type == TEAM_DRIVE.

[hashimoto, 2017/03/22 06:40:30]

ditto.

[yamaguchi, 2017/03/22 07:30:36]

Done.

+  const std::string& team_drive_id() const { return team_drive_id_; }
+
   // Returns the time of this modification.
   const base::Time& modification_date() const { return modification_date_; }
 
   void set_change_id(int64_t change_id) { change_id_ = change_id; }
   void set_file_id(const std::string& file_id) {
     file_id_ = file_id;
   }
   void set_deleted(bool deleted) {
     deleted_ = deleted;
   }
   void set_file(std::unique_ptr<FileResource> file) { file_ = std::move(file); }
   void set_modification_date(const base::Time& modification_date) {
     modification_date_ = modification_date;
   }
 
  private:
   friend class base::internal::RepeatedMessageConverter<ChangeResource>;
   friend class ChangeList;
 
   // Parses and initializes data members from content of |value|.
   // Return false if parsing fails.
   bool Parse(const base::Value& value);
 
+  // Extracts the change type from the given string. Returns false and does
+  // not change |result| when |type_name| has an unrecognizable value.
+  static bool GetType(const base::StringPiece& type_name,
+                      ChangeResource::ChangeType* result);
+
   int64_t change_id_;
+  ChangeType type_;
   std::string file_id_;
   bool deleted_;
   std::unique_ptr<FileResource> file_;
   base::Time modification_date_;
+  std::string team_drive_id_;
+  std::unique_ptr<TeamDriveResource> team_drive_;
 
   DISALLOW_COPY_AND_ASSIGN(ChangeResource);
 };
 
 // ChangeList represents a set of changes in the drive.
 // https://developers.google.com/drive/v2/reference/changes/list
 class ChangeList {
  public:
   ChangeList();
   ~ChangeList();
@@ skipping 42 matching lines @@
   GURL next_link_;
   int64_t largest_change_id_;
   std::vector<std::unique_ptr<ChangeResource>> items_;
 
   DISALLOW_COPY_AND_ASSIGN(ChangeList);
 };
 
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_