Media Galleries API Picasa: Make PicasaDataProvider handle async PMP and INI parsing robustly.

chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc

Index: chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc
diff --git a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc
index d15cb78f9677b728524e35810c75311765cb7b2d..7a98819ccceaca9108e40ce0a7a9e0b353a54245 100644
--- a/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa/picasa_file_util.cc
@@ -64,6 +64,7 @@ void PicasaFileUtil::GetFileInfoOnTaskRunnerThread(
     const fileapi::FileSystemURL& url,
     const GetFileInfoCallback& callback) {
   GetDataProvider()->RefreshData(
+      PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA,
       base::Bind(&PicasaFileUtil::GetFileInfoWithFreshDataProvider,
                  weak_factory_.GetWeakPtr(), base::Passed(&context), url,
                  callback));
@@ -74,6 +75,7 @@ void PicasaFileUtil::ReadDirectoryOnTaskRunnerThread(
     const fileapi::FileSystemURL& url,
     const ReadDirectoryCallback& callback) {
   GetDataProvider()->RefreshData(
+      PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA,
       base::Bind(&PicasaFileUtil::ReadDirectoryWithFreshDataProvider,
                  weak_factory_.GetWeakPtr(), base::Passed(&context), url,
                  callback));
@@ -281,7 +283,18 @@ base::PlatformFileError PicasaFileUtil::GetLocalFilePath(
 void PicasaFileUtil::GetFileInfoWithFreshDataProvider(
     scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
-    const GetFileInfoCallback& callback) {
+    const GetFileInfoCallback& callback,
+    bool success) {
+  if (!success) {
+    if (!callback.is_null()) {

[vandebo (ex-Chrome), 2013/07/12 18:29:59]

Upstream changed to ensure that callback can't be null.  You can remove this
check.

[tommycli, 2013/07/12 21:37:19]

Done.

+      content::BrowserThread::PostTask(
+          content::BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(callback, base::PLATFORM_FILE_ERROR_IO,
+                     base::PlatformFileInfo()));
+    }
+    return;
+  }
   NativeMediaFileUtil::GetFileInfoOnTaskRunnerThread(context.Pass(), url,
                                                      callback);
 }
@@ -289,7 +302,18 @@ void PicasaFileUtil::GetFileInfoWithFreshDataProvider(
 void PicasaFileUtil::ReadDirectoryWithFreshDataProvider(
     scoped_ptr<fileapi::FileSystemOperationContext> context,
     const fileapi::FileSystemURL& url,
-    const ReadDirectoryCallback& callback) {
+    const ReadDirectoryCallback& callback,
+    bool success) {
+  if (!success) {
+    if (!callback.is_null()) {
+      content::BrowserThread::PostTask(
+          content::BrowserThread::IO,
+          FROM_HERE,
+          base::Bind(callback, base::PLATFORM_FILE_ERROR_IO,
+                     base::PlatformFileInfo()));
+    }
+    return;
+  }
   NativeMediaFileUtil::ReadDirectoryOnTaskRunnerThread(context.Pass(), url,
                                                        callback);
 }