Process TeamDrive change in change list.

components/drive/chromeos/change_list_processor.cc

 // 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.
 
 #include "components/drive/chromeos/change_list_processor.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/cancellation_flag.h"
 #include "components/drive/chromeos/resource_metadata.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_api_util.h"
 #include "components/drive/file_change.h"
 #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 {
 
 namespace {
 
 class ChangeListToEntryMapUMAStats {
  public:
   ChangeListToEntryMapUMAStats()
     : num_regular_files_(0),
@@ skipping 41 matching lines @@
 ChangeList::ChangeList(const google_apis::ChangeList& change_list)
     : next_url_(change_list.next_link()),
       largest_changestamp_(change_list.largest_change_id()) {
   const std::vector<std::unique_ptr<google_apis::ChangeResource>>& items =
       change_list.items();
   entries_.resize(items.size());
   parent_resource_ids_.resize(items.size());
   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;
     }
   }
   entries_.resize(entries_index);
   parent_resource_ids_.resize(entries_index);
 }
 
 ChangeList::ChangeList(const google_apis::FileList& file_list)
     : next_url_(file_list.next_link()),
@@ skipping 205 matching lines @@
         }
       }
       it = it_parent;
     }
 
     // Apply the parent first.
     std::reverse(entries.begin(), entries.end());
     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);
         if (error != FILE_ERROR_OK) {
           LOG(ERROR) << "ApplyEntry failed: " << FileErrorToString(error)
                      << ", title = " << it->second.title();
           return error;
         }
       }
       entry_map_.erase(it);
@@ skipping 20 matching lines @@
                  << ", resource_id = " << deleted_resource_ids[i];
       return error;
     }
   }
 
   return FILE_ERROR_OK;
 }
 
 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()];
 
   ResourceEntry new_entry(entry);
   FileError error = SetParentLocalIdOfEntry(resource_metadata_, &new_entry,
                                             parent_resource_id);
   if (error != FILE_ERROR_OK)
     return error;
 
@@ skipping 130 matching lines @@
   if (!file_path.empty()) {
     FileChange::ChangeType type = entry.deleted()
                                       ? FileChange::CHANGE_TYPE_DELETE
                                       : FileChange::CHANGE_TYPE_ADD_OR_UPDATE;
     changed_files_->Update(file_path, entry, type);
   }
 }
 
 }  // namespace internal
 }  // namespace drive