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

chrome/utility/media_galleries/picasa_albums_indexer.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/common/media_galleries/picasa_types.h"
 #include "chrome/utility/media_galleries/picasa_albums_indexer.h"
 
 #include <vector>
 
 #include "base/ini_parser.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 
 namespace picasa {
 
@@ skipping 21 matching lines @@
     // [.album:*] sections ignored as we get that data from the PMP files.
     if (section.find(kAlbumSectionHeader) == 0)
       return;
 
     std::vector<std::string> containing_albums;
     base::SplitString(value, ',', &containing_albums);
     for (std::vector<std::string>::iterator it = containing_albums.begin();
          it != containing_albums.end(); ++it) {
       AlbumImagesMap::iterator album_map_it = albums_images_->find(*it);
 
-      // Ignore entry if the album UUID is not listed among in |album_uuids|
+      // Ignore entry if the album uid is not listed among in |album_uids|
       // in the constructor. Happens if the PMP and INI files are inconsistent.
       if (album_map_it == albums_images_->end())
         continue;
 
       album_map_it->second.insert(
           folder_path_.Append(base::FilePath::FromUTF8Unsafe(section)));
     }
   }
 
   const base::FilePath folder_path_;
   AlbumImagesMap* const albums_images_;
 };
 
 }  // namespace
 
-PicasaAlbumsIndexer::PicasaAlbumsIndexer(
-    const AlbumUUIDSet& album_uuids) {
-  // Create an entry in the map for the valid album uuids.
-  for (AlbumUUIDSet::const_iterator it = album_uuids.begin();
-       it != album_uuids.end(); ++it) {
+PicasaAlbumsIndexer::PicasaAlbumsIndexer(const AlbumUIDSet& album_uids) {
+  // Create an entry in the map for the valid album uids.
+  for (AlbumUIDSet::const_iterator it = album_uids.begin();
+       it != album_uids.end(); ++it) {
     albums_images_[*it] = AlbumImages();
   }
 }
 
 PicasaAlbumsIndexer::~PicasaAlbumsIndexer() {}
 
 void PicasaAlbumsIndexer::ParseFolderINI(
     const base::FilePath& folder_path, const std::string& ini_contents) {
   PicasaINIParser parser(folder_path, &albums_images_);
   parser.Parse(ini_contents);
 }
 
 }  // namespace picasa