Process TeamDrive change in change list.

components/drive/chromeos/change_list_processor.cc

Index: components/drive/chromeos/change_list_processor.cc
diff --git a/components/drive/chromeos/change_list_processor.cc b/components/drive/chromeos/change_list_processor.cc
index 3eb96bb1c81a47f9d7de103166f40b752d7b951f..5ce4221ef009a62721d0e3a85eca2543e6f9fb6e 100644
--- a/components/drive/chromeos/change_list_processor.cc
+++ b/components/drive/chromeos/change_list_processor.cc
@@ -20,6 +20,7 @@
 #include "components/drive/file_system_core_util.h"
 #include "components/drive/resource_entry_conversion.h"
 #include "google_apis/drive/drive_api_parser.h"
+#include "google_apis/drive/drive_switches.h"

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

No longer needed.

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

Done.

 
 namespace drive {
 namespace internal {
@@ -81,8 +82,7 @@ ChangeList::ChangeList(const google_apis::ChangeList& change_list)
   size_t entries_index = 0;
   for (size_t i = 0; i < items.size(); ++i) {
     if (ConvertChangeResourceToResourceEntry(
-            *items[i],
-            &entries_[entries_index],
+            *items[i], &entries_[entries_index],
             &parent_resource_ids_[entries_index])) {
       ++entries_index;
     }
@@ -308,6 +308,8 @@ FileError ChangeListProcessor::ApplyEntryMap(
     for (size_t i = 0; i < entries.size(); ++i) {
       // Skip root entry in the change list. We don't expect servers to send
       // root entry, but we should better be defensive (see crbug.com/297259).
+      // TODO(yamaguchi): Apply this defensive logic to root directories of

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

Why do you need to do this?

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

According to crbug.com/297259, the root directory may be sent to client by Drive
server's bug. The crbug thread says that, if we receive such data and don't drop
such data here, all file will seemingly disappear from the directory list.
(because it'll create directory like /others/root and then associate all files
there).
The same thing could happen with Team Drive root directories, because a root
directory of Team Drive don't have parent resource ID.
However I am not sure how frequently such a server bug happens.

[hashimoto, 2017/04/11 07:55:14]

We are doing this for My Drive root because the said bug actually happened.
Are you seeing the said problem actually happening with Team Drives?
If so, please fix it now, if not, no TODO is needed for it.

+      // every Team Drive as well.
       ResourceEntryMap::iterator it = entries[i];
       if (it->first != root.resource_id()) {
         FileError error = ApplyEntry(it->second);
@@ -348,6 +350,7 @@ FileError ChangeListProcessor::ApplyEntryMap(
 
 FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
   DCHECK(!entry.deleted());
+  DCHECK(!entry.resource_id().empty());
   DCHECK(parent_resource_id_map_.count(entry.resource_id()));
   const std::string& parent_resource_id =
       parent_resource_id_map_[entry.resource_id()];