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 be2ff346a11df63496b0882c428eb22ecfb2cc96..194a4fd853056deed245f0a2327b2dcfa25f5baa 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,11 @@
 #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.h"
 #include "content/public/browser/utility_process_host_client.h"
 
 namespace base {
@@ -31,7 +33,10 @@ namespace picasa {
 // utility process replies or when it dies.
 class SafePicasaAlbumsIndexer : public content::UtilityProcessHostClient {
  public:
-  typedef base::Callback<void(const picasa::AlbumImagesMap&)> DoneCallback;
+  // 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>,
+                              const picasa::AlbumImagesMap&)> DoneCallback;
 
   SafePicasaAlbumsIndexer(const AlbumMap& albums,
                           const AlbumMap& folders,
@@ -74,6 +79,9 @@ class SafePicasaAlbumsIndexer : public content::UtilityProcessHostClient {
 
   std::vector<picasa::FolderINIContents> folders_inis_;
 
+  // Only accessed on the IO thread.
+  base::WeakPtr<content::UtilityProcessHost> utility_process_host_;
+
   // Only accessed on the Media Task Runner.
   const DoneCallback callback_;