drive: Fills no-parent entiries in "/drive/other".

chrome/browser/chromeos/drive/drive_file_system.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_file_system.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop_proxy.h"
@@ skipping 996 matching lines @@
   DCHECK(!callback.is_null());
 
   if (error != DRIVE_FILE_OK) {
     callback.Run(error);
     return;
   }
   if (!entry_proto->file_info().is_directory()) {
     callback.Run(DRIVE_FILE_ERROR_NOT_A_DIRECTORY);
     return;
   }
+  if (util::IsSpecialResourceId(entry_proto->resource_id())) {
+    // Do not load special directories. Just return.
+    callback.Run(DRIVE_FILE_OK);
+    return;
+  }
 
   change_list_loader_->LoadDirectoryFromServer(
       entry_proto->resource_id(),
       callback);
 }
 
 void DriveFileSystem::UpdateFileByResourceId(
     const std::string& resource_id,
     const DriveClientContext& context,
     const FileOperationCallback& callback) {
@@ skipping 76 matching lines @@
     const bool should_run_callback = (i + 1 == entries.size());
     const DriveEntryProto& entry_proto = entries[i];
 
     const GetEntryInfoWithFilePathCallback entry_info_callback =
         base::Bind(&DriveFileSystem::AddToSearchResults,
                    weak_ptr_factory_.GetWeakPtr(),
                    results,
                    should_run_callback,
                    callback);
 
-    // Some entries (e.g. shared_with_me files) are not tracked in
-    // DriveResourceMetadata, so that we skip RefreshEntry() and call the
-    // callback directly.
-    if (!shared_with_me) {
-      resource_metadata_->RefreshEntry(entry_proto, entry_info_callback);
-    } else {
-      entry_info_callback.Run(
-          DRIVE_FILE_OK,
-          base::FilePath::FromUTF8Unsafe(entry_proto.base_name()),
-          scoped_ptr<DriveEntryProto>(new DriveEntryProto(entry_proto)));
-    }
+    resource_metadata_->RefreshEntry(entry_proto, entry_info_callback);
   }
 }
 
 void DriveFileSystem::AddToSearchResults(
     std::vector<SearchResultInfo>* results,
     bool should_run_callback,
     const base::Closure& callback,
     DriveFileError error,
     const base::FilePath& drive_file_path,
     scoped_ptr<DriveEntryProto> entry_proto) {
@@ skipping 578 matching lines @@
     return;
   }
 
   PlatformFileInfoProto entry_file_info;
   util::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   callback.Run(DRIVE_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace drive