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

chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h

Index: chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h
diff --git a/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h
index 9c299ddac768a6da10b1f96a106842ec623dff46..52d29517a2aad05c66530f11984d274be9a384c7 100644
--- a/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h
+++ b/chrome/browser/media_galleries/fileapi/safe_picasa_albums_indexer.h
@@ -9,9 +9,10 @@
 #include <vector>
 
 #include "base/callback.h"
-#include "base/compiler_specific.h"
+#include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/common/media_galleries/picasa_types.h"
+#include "chrome/common/media_galleries/picasa_types.h"
 #include "content/public/browser/utility_process_host_client.h"
 
 namespace base {
@@ -31,7 +32,10 @@ namespace picasa {
 // utility process replies or when it dies.
 class SafePicasaAlbumsIndexer : public content::UtilityProcessHostClient {
  public:
-  typedef base::Callback<void(bool success,
+  // Callback includes a refptr to itself to guarantee that this object
+  // survives past the execution of its last posted callback.
+  typedef base::Callback<void(scoped_refptr<SafePicasaAlbumsIndexer>,
+                              bool success,
                               const picasa::AlbumImagesMap&)> DoneCallback;
 
   SafePicasaAlbumsIndexer(const AlbumMap& albums,