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

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

 // Copyright 2013 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/media_galleries/fileapi/picasa/picasa_file_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 46 matching lines @@
     : weak_factory_(this) {
 }
 
 PicasaFileUtil::~PicasaFileUtil() {}
 
 void PicasaFileUtil::GetFileInfoOnTaskRunnerThread(
     scoped_ptr<fileapi::FileSystemOperationContext> context,
     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));
 }
 
 void PicasaFileUtil::ReadDirectoryOnTaskRunnerThread(
     scoped_ptr<fileapi::FileSystemOperationContext> context,
     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));
 }
 
 base::PlatformFileError PicasaFileUtil::GetFileInfoSync(
     FileSystemOperationContext* context, const FileSystemURL& url,
     base::PlatformFileInfo* file_info, base::FilePath* platform_path) {
   DCHECK(context);
   DCHECK(file_info);
@@ skipping 187 matching lines @@
 
   // All other cases don't have a local path. The valid cases should be
   // intercepted by GetFileInfo()/CreateFileEnumerator(). Invalid cases
   // return a NOT_FOUND error.
   return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 }
 
 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);
 }
 
 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);
 }
 
 PicasaDataProvider* PicasaFileUtil::GetDataProvider() {
   return chrome::ImportedMediaGalleryRegistry::PicasaDataProvider();
 }
 
 }  // namespace picasa