Handle trashed file properly (Drive V2 API)

chrome/browser/chromeos/gdata/gdata_wapi_parser.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 "chrome/browser/chromeos/gdata/gdata_wapi_parser.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
@@ skipping 807 matching lines @@
   entry->content_.url_ = file.web_content_link();
   entry->content_.mime_type_ = file.mime_type();
   // TODO(kochi): entry->feed_links_
 
   // For file entries
   entry->filename_ = UTF8ToUTF16(file.title());
   entry->suggested_filename_ = UTF8ToUTF16(file.title());
   entry->file_md5_ = file.md5_checksum();
   entry->file_size_ = file.file_size();
 
-  entry->deleted_ = false;  // later filled by CreateFromChangeResource.
+  entry->deleted_ = file.labels().is_trashed();

[hashimoto, 2012/08/14 10:21:52]

Could you add a brief comment about:
1. What is the difference between |deleted_| and |removed_|?
2. Why are we having both |deleted_| and |removed_| even if we are returning
'deleted_ || removed_' from DocumentEntry::deleted()?

[kochi, 2012/08/14 10:32:11]

Updated comments.
And I noticed that |removed_| field is initialized false,
we don't have to set false on line 829.

   entry->removed_ = false;  // later filled by CreateFromChangeResource.
 
   // FeedEntry
   entry->etag_ = file.etag();
   // entry->authors_
   // entry->links_.
   if (!file.parents().empty()) {
     Link* link = new Link();
     link->type_ = Link::PARENT;
     link->href_ = file.parents()[0]->parent_link();
@@ skipping 29 matching lines @@
   // TODO: Do we need this?
   entry->FillRemainingFields();
   return entry.release();
 }
 
 // static
 DocumentEntry*
 DocumentEntry::CreateFromChangeResource(const ChangeResource& change) {
   DocumentEntry* entry = CreateFromFileResource(change.file());
 
-  entry->deleted_ = change.is_deleted();
   entry->removed_ = change.is_deleted();
 
   return entry;
 }
 
 // static
 std::string DocumentEntry::GetEntryNodeName() {
   return kEntryNode;
 }
 
@@ skipping 227 matching lines @@
 bool AccountMetadataFeed::Parse(const base::Value& value) {
   base::JSONValueConverter<AccountMetadataFeed> converter;
   if (!converter.Convert(value, this)) {
     LOG(ERROR) << "Unable to parse: Invalid account metadata feed!";
     return false;
   }
   return true;
 }
 
 }  // namespace gdata