drive: Add showroot=true to WAPI feed URLs and ignore "no parent" entries.

chrome/browser/chromeos/drive/drive_resource_metadata.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/drive/drive_resource_metadata.h"
 
 #include <leveldb/db.h>
 #include <stack>
 #include <utility>
 
@@ skipping 370 matching lines @@
   // Reject incompatible input.
   if (entry->proto().file_info().is_directory() !=
       entry_proto.file_info().is_directory()) {
     PostGetEntryInfoWithFilePathCallbackError(
         callback, DRIVE_FILE_ERROR_INVALID_OPERATION);
     return;
   }
 
   // Update data.
   if (entry != root_.get()) {
-    DriveDirectory* old_parent = GetParent(entry->parent_resource_id());
-    DriveDirectory* new_parent = GetParent(entry_proto.parent_resource_id());
+    DriveDirectory* old_parent = GetDirectory(entry->parent_resource_id());
+    DriveDirectory* new_parent = GetDirectory(entry_proto.parent_resource_id());
 
     if (!old_parent || !new_parent) {
       PostGetEntryInfoWithFilePathCallbackError(
           callback, DRIVE_FILE_ERROR_NOT_FOUND);
       return;
     }
 
     // Remove from the old parent and add to the new parent.
     old_parent->RemoveChild(entry);
+    // FromProto(entry_proto) imports the fields from |entry_proto|. Note that
+    // this assumes |entry_proto| contains metadata only about the entry itself.

[hashimoto, 2013/03/12 07:55:17]

This comment seems to be redundant.
Only DriveDirectoryProto has fields for child entries (it's only used for
serialization, though), and DriveEntryProto has no field for child entries.

[Haruki Sato, 2013/03/12 08:17:23]

Thank you for the good explanation. Seemsl like I had trouble understanding this
when I was reading it.
Removed.

+    // i.e. no children protos included.
     entry->FromProto(entry_proto);
     new_parent->AddEntry(entry);  // Transfers ownership.
   } else {
     // root has no parent.
     entry->FromProto(entry_proto);
   }
 
   DVLOG(1) << "RefreshEntry " << GetFilePath(entry->proto()).value();
   // Note that base_name is not the same for new_entry and entry_proto.
   scoped_ptr<DriveEntryProto> result_entry_proto(
@@ skipping 42 matching lines @@
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, DRIVE_FILE_OK, GetFilePath(directory->proto())));
 }
 
 void DriveResourceMetadata::AddEntry(const DriveEntryProto& entry_proto,
                                      const FileMoveCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  DriveDirectory* parent = GetParent(entry_proto.parent_resource_id());
+  DriveDirectory* parent = GetDirectory(entry_proto.parent_resource_id());
   if (!parent) {
     PostFileMoveCallbackError(callback, DRIVE_FILE_ERROR_NOT_FOUND);
     return;
   }
 
   scoped_ptr<DriveEntry> new_entry = CreateDriveEntryFromProto(entry_proto);
   if (!new_entry.get()) {
     PostFileMoveCallbackError(callback, DRIVE_FILE_ERROR_FAILED);
     return;
   }
 
   DriveEntry* added_entry = new_entry.release();
   parent->AddEntry(added_entry);  // Transfers ownership.
   DVLOG(1) << "AddEntry "  << GetFilePath(added_entry->proto()).value();
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, DRIVE_FILE_OK, GetFilePath(added_entry->proto())));
 }
 
-DriveDirectory* DriveResourceMetadata::GetParent(
+DriveDirectory* DriveResourceMetadata::GetDirectory(
     const std::string& parent_resource_id) {

[hashimoto, 2013/03/12 07:55:17]

nit: s/parent_resource_id/resource_id/?

[Haruki Sato, 2013/03/12 08:17:23]

Done. Thanks.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  if (parent_resource_id.empty())
-    return root_.get();
+  DCHECK(!parent_resource_id.empty());
 
   DriveEntry* entry = GetEntryByResourceId(parent_resource_id);
   return entry ? entry->AsDriveDirectory() : NULL;
 }
 
 base::FilePath DriveResourceMetadata::GetFilePath(
     const DriveEntryProto& entry) {
   base::FilePath path;
   DriveEntry* parent = entry.parent_resource_id().empty() ? NULL :
       GetEntryByResourceId(entry.parent_resource_id());
@@ skipping 139 matching lines @@
   DCHECK(result.get());
 
   result->second.path = second_path;
   result->second.error = error;
   result->second.proto = entry_proto.Pass();
 
   callback.Run(result.Pass());
 }
 
 }  // namespace drive