Parent/child fixes.

chrome/browser/chromeos/gdata/gdata_file_system_proxy.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_file_system_proxy.h"
 
+#include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "webkit/blob/shareable_file_reference.h"
@@ skipping 247 matching lines @@
   if (error != base::PLATFORM_FILE_OK) {
     proxy->PostTask(FROM_HERE,
                     base::Bind(callback,
                                error,
                                std::vector<base::FileUtilProxy::Entry>(),
                                false));
     return;
   }
   std::vector<base::FileUtilProxy::Entry> entries;
   // Convert gdata files to something File API stack can understand.
+  for (GDataDirectoryCollection::const_iterator iter =
+            directory->child_directories().begin();
+       iter != directory->child_directories().end(); ++iter) {
+    entries.push_back(GDataEntryToFileUtilProxyEntry(*(iter->second)));
+  }
   for (GDataFileCollection::const_iterator iter =
-            directory->children().begin();
-       iter != directory->children().end(); ++iter) {
+            directory->child_files().begin();
+       iter != directory->child_files().end(); ++iter) {
     if (hide_hosted_documents) {
-      GDataFile* file = iter->second->AsGDataFile();
-      if (file && file->is_hosted_document())
+      GDataFile* file = iter->second;
+      if (file->is_hosted_document())
         continue;
     }
-
     entries.push_back(GDataEntryToFileUtilProxyEntry(*(iter->second)));
   }
 
   proxy->PostTask(FROM_HERE,
                   base::Bind(callback,
                              base::PLATFORM_FILE_OK,
                              entries,
                              false));
 }
 
 }  // namespace gdata