Handle trashed file properly (Drive V2 API)

chrome/browser/chromeos/gdata/gdata_wapi_parser.cc

Index: chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc b/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
index f0df48356ec06dc3b313bee57d1ffa0905f5eabe..3fc58b4bf38807f9a9a8dfa9abe11aa20948490c 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
+++ b/chrome/browser/chromeos/gdata/gdata_wapi_parser.cc
@@ -825,7 +825,7 @@ DocumentEntry* DocumentEntry::CreateFromFileResource(const FileResource& file) {
   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
@@ -875,7 +875,6 @@ DocumentEntry*
 DocumentEntry::CreateFromChangeResource(const ChangeResource& change) {
   DocumentEntry* entry = CreateFromFileResource(change.file());
 
-  entry->deleted_ = change.is_deleted();
   entry->removed_ = change.is_deleted();
 
   return entry;