Media Galleries API - Picasa: Change PMP Parsing to deal with PlatformFile.

chrome/browser/media_galleries/fileapi/picasa/picasa_data_provider.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/browser/media_galleries/fileapi/picasa/picasa_data_provider.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 71 matching lines @@
     if (total_counts[name] != 1) {
       name = base::StringPrintf("%s (%d)", name.c_str(),
                                 ++current_counts[name]);
     }
 
     result_map->insert(std::pair<std::string, AlbumInfo>(name, info_list[i]));
   }
 }
 
 bool PicasaDataProvider::ReadData() {
-  PicasaAlbumTableReader album_table_reader(database_path_);
+  PicasaAlbumTableFiles album_table_files(database_path_);
+  PicasaAlbumTableReader album_table_reader((album_table_files));
 
-  if (!album_table_reader.Init())
-    return false;
+  bool read_success = album_table_reader.Init();
 
-  InitializeWith(album_table_reader.albums(),
-                 album_table_reader.folders());
+  ClosePicasaAlbumTableFiles(&album_table_files);
 
-  return true;
+  if (read_success)
+    InitializeWith(album_table_reader.albums(), album_table_reader.folders());
+
+  return read_success;
 }
 
 }  // namespace picasa