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

chrome/browser/media_galleries/fileapi/picasa/picasa_album_table_reader.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_ALBUM_TABLE_READER_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_ALBUM_TABLE_READER_H_
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
+#include "base/platform_file.h"
 #include "base/time.h"
 
 namespace picasa {
 
 const base::Time::Exploded kPicasaVariantTimeEpoch = {
   1899, 12, 7, 30,  // Dec 30, 1899 (Saturday)
   0, 0, 0, 0        // 00:00:00.000
 };
 
 const char kPicasaAlbumTableName[] = "albumdata";
@@ skipping 10 matching lines @@
             const std::string& uid, const base::FilePath& path);
 
   ~AlbumInfo();
 
   std::string name;
   base::Time timestamp;
   std::string uid;
   base::FilePath path;
 };
 
+struct PicasaAlbumTableFiles {
+  explicit PicasaAlbumTableFiles(const base::FilePath& directory_path);
+  void CloseAll();

[Lei Zhang, 2013/06/21 02:15:50]

One you start adding methods, classes are preferred. Since there's only 1
method, just write it as a function that takes a PicasaAlbumTableFiles* ?

[tommycli, 2013/06/21 16:14:23]

Sounds good.

+
+  base::PlatformFile indicator_file;
+

[Lei Zhang, 2013/06/21 02:15:50]

nit: why the extra blank line. Is |indicator_file| special in some way?

[tommycli, 2013/06/21 16:14:23]

Yes, indicator_file is a special empty file used to confirm the existence of the
table. I'll add a comment to that effect.

+  base::PlatformFile category_file;
+  base::PlatformFile date_file;
+  base::PlatformFile filename_file;
+  base::PlatformFile name_file;
+  base::PlatformFile token_file;
+  base::PlatformFile uid_file;
+};
+
 class PicasaAlbumTableReader {
  public:
-  // |directory_path| is Picasa's db3 directory where the PMP table is stored.
-  explicit PicasaAlbumTableReader(const base::FilePath& directory_path);
+  explicit PicasaAlbumTableReader(const PicasaAlbumTableFiles& table_files);
   virtual ~PicasaAlbumTableReader();
 
   bool Init();
 
   const std::vector<AlbumInfo>& albums() const;
   const std::vector<AlbumInfo>& folders() const;
 
  private:
-  const base::FilePath directory_path_;
+  PicasaAlbumTableFiles table_files_;

[Lei Zhang, 2013/06/21 02:15:50]

looks like this can be const.

[tommycli, 2013/06/21 16:14:23]

Done.

 
   bool initialized_;
 
   std::vector<AlbumInfo> albums_;
   std::vector<AlbumInfo> folders_;
 
   DISALLOW_COPY_AND_ASSIGN(PicasaAlbumTableReader);
 };
 
 }  // namespace picasa
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_FILEAPI_PICASA_PICASA_ALBUM_TABLE_READER_H_