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

chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h

Index: chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h
diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h
index 7ba576488449cf510a6d72b6220f139ee9ebf27d..c5bfe5275af23235aa7ff3f0073eb61983e93292 100644
--- a/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h
+++ b/chrome/browser/media_galleries/fileapi/safe_picasa_album_table_reader.h
@@ -31,14 +31,14 @@ namespace picasa {
 // utility process replies or when it dies.
 class SafePicasaAlbumTableReader : public content::UtilityProcessHostClient {
  public:
-  typedef base::Callback<void(bool,
+  typedef base::Callback<void(bool parse_success,
                               const std::vector<AlbumInfo>&,
-                              const std::vector<AlbumInfo>&)> ParserCallback;
+                              const std::vector<AlbumInfo>&)>
+      ParserCallback;
 
-  SafePicasaAlbumTableReader(const AlbumTableFiles& album_table_files,
-                             const ParserCallback& callback);
+  explicit SafePicasaAlbumTableReader(const AlbumTableFiles& album_table_files);
 
-  void Start();
+  void Start(const ParserCallback& callback);
 
  private:
   enum ParserState {
@@ -77,7 +77,7 @@ class SafePicasaAlbumTableReader : public content::UtilityProcessHostClient {
   base::WeakPtr<content::UtilityProcessHost> utility_process_host_;
 
   // Only accessed on the Media Task Runner.
-  const ParserCallback callback_;
+  ParserCallback callback_;
 
   // Verifies the messages from the utility process came at the right time.
   // Initialized on the Media Task Runner, but only accessed on the IO thread.