Parent/child fixes.

chrome/browser/chromeos/gdata/gdata_file_system.cc

Index: chrome/browser/chromeos/gdata/gdata_file_system.cc
===================================================================
--- chrome/browser/chromeos/gdata/gdata_file_system.cc	(revision 133890)
+++ chrome/browser/chromeos/gdata/gdata_file_system.cc	(working copy)
@@ -54,7 +54,6 @@
 const char kMimeTypeJson[] = "application/json";
 const char kMimeTypeOctetStream[] = "application/octet-stream";
 
-const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("gdata");
 const char kWildCard[] = "*";
 const char kLocallyModifiedFileExtension[] = "local";
 const char kMountedArchiveFileExtension[] = "mounted";
@@ -416,13 +415,12 @@
   if (!dir)
     return;
 
-  for (GDataFileCollection::const_iterator it = dir->children().begin();
-       it != dir->children().end(); ++it) {
-    GDataDirectory* child_dir = it->second->AsGDataDirectory();
-    if (child_dir) {
-      changed_dirs->insert(child_dir->GetFilePath());
-      GetChildDirectoryPaths(child_dir, changed_dirs);
-    }
+  for (GDataDirectoryCollection::const_iterator it =
+       dir->child_directories().begin();
+       it != dir->child_directories().end(); ++it) {
+    GDataDirectory* child_dir = it->second;
+    changed_dirs->insert(child_dir->GetFilePath());
+    GetChildDirectoryPaths(child_dir, changed_dirs);
   }
 }
 
@@ -845,7 +843,6 @@
   documents_service_->Initialize(profile_);
 
   root_.reset(new GDataRootDirectory);
-  root_->set_file_name(kGDataRootDirectory);
 
   PrefService* pref_service = profile_->GetPrefs();
   hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableGDataHostedFiles);