Media Galleries API Picasa: Put INI indexing step into sandboxed utility process.

chrome/utility/chrome_content_utility_client.h

Index: chrome/utility/chrome_content_utility_client.h
diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
index b88143e40d842bd5b15a53f968c9e71c508ce7e3..482980c931a7b829bba97b7bc051b53520567d45 100644
--- a/chrome/utility/chrome_content_utility_client.h
+++ b/chrome/utility/chrome_content_utility_client.h
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
+#include "chrome/common/media_galleries/picasa_types.h"
 #include "content/public/utility/content_utility_client.h"
 #include "ipc/ipc_platform_file.h"
 #include "printing/pdf_render_settings.h"
@@ -21,10 +22,6 @@ namespace gfx {
 class Rect;
 }
 
-namespace picasa {
-struct AlbumTableFilesForTransit;
-}
-
 namespace printing {
 struct PageRange;
 }
@@ -89,11 +86,15 @@ class ChromeContentUtilityClient : public content::ContentUtilityClient {
 #endif  // defined(OS_WIN)
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
+  void OnParseITunesLibraryXmlFile(
+      IPC::PlatformFileForTransit itunes_library_file);
+
   void OnParsePicasaPMPDatabase(
       const picasa::AlbumTableFilesForTransit& album_table_files);
 
-  void OnParseITunesLibraryXmlFile(
-      IPC::PlatformFileForTransit itunes_library_file);
+  void OnIndexPicasaAlbumsContents(
+      const picasa::AlbumUIDSet& album_uids,
+      const std::vector<picasa::FolderINIContents>& folders_inis);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
   scoped_ptr<ProfileImportHandler> import_handler_;