Process TeamDrive change in change list.

components/drive/resource_entry_conversion.cc

Index: components/drive/resource_entry_conversion.cc
diff --git a/components/drive/resource_entry_conversion.cc b/components/drive/resource_entry_conversion.cc
index 52eda29bffc8b0f0c4a9c826d707920a90129d48..5e042cdd1d651e702ee3691e13a620f60645cc91 100644
--- a/components/drive/resource_entry_conversion.cc
+++ b/components/drive/resource_entry_conversion.cc
@@ -26,12 +26,17 @@ bool ConvertChangeResourceToResourceEntry(
 
   ResourceEntry converted;
   std::string parent_resource_id;
-  if (input.file() &&
-      !ConvertFileResourceToResourceEntry(*input.file(), &converted,
-                                          &parent_resource_id))
+  if (input.type() == google_apis::ChangeResource::TEAM_DRIVE) {
+    if (!ConvertTeamDriveChangeResourceToResourceEntry(input, &converted,
+                                                       &parent_resource_id)) {
       return false;
-
-  converted.set_resource_id(input.file_id());
+    }
+  } else {
+    if (input.file() && !ConvertFileResourceToResourceEntry(
+                            *input.file(), &converted, &parent_resource_id))
+      return false;
+    converted.set_resource_id(input.file_id());
+  }
   converted.set_deleted(converted.deleted() || input.is_deleted());
   converted.set_modification_date(input.modification_date().ToInternalValue());
 
@@ -141,4 +146,24 @@ void ConvertResourceEntryToFileInfo(const ResourceEntry& entry,
       entry.file_info().creation_time());
 }
 
+bool ConvertTeamDriveChangeResourceToResourceEntry(

[hashimoto, 2017/04/10 11:01:24]

For FileResource, we have ConvertFileResourceToResourceEntry.
This can be ConvertTeamDriveResourceToResourceEntry in the same manner.

[yamaguchi, 2017/04/11 07:08:07]

Splitted ConvertTeamDriveResourceToResourceEntry, but this still needs to access
a field in ChangeResource. (because team_drive is not filled when deleting)
The function will be reused when processing data from TeamDrives:list by another
change later.

+    const google_apis::ChangeResource& input,
+    ResourceEntry* out_entry,
+    std::string* out_parent_resource_id) {
+  DCHECK(out_entry);
+  DCHECK(out_parent_resource_id);
+  DCHECK_EQ(google_apis::ChangeResource::TEAM_DRIVE, input.type());
+  ResourceEntry converted;
+  converted.mutable_file_info()->set_is_directory(true);
+  converted.set_parent_local_id(util::kDriveTeamDrivesDirLocalId);
+  *out_parent_resource_id = util::kDriveTeamDrivesDirVirtualResourceId;
+  if (input.team_drive()) {
+    converted.set_title(input.team_drive()->name());
+    converted.set_base_name(input.team_drive()->name());
+  }
+  converted.set_resource_id(input.team_drive_id());
+  out_entry->Swap(&converted);
+  return true;
+}
+
 }  // namespace drive