PicasaAlbumTableReader for Media Galleries API

webkit/fileapi/media/picasa/pmp_test_helper.h

Index: webkit/fileapi/media/picasa/pmp_test_helper.h
diff --git a/webkit/fileapi/media/picasa/pmp_test_helper.h b/webkit/fileapi/media/picasa/pmp_test_helper.h
index e8f2290009c360757df7bf8b722c4e9963c92156..7254d36dec93b8882d90f615e1dbc3d3cec333dc 100644
--- a/webkit/fileapi/media/picasa/pmp_test_helper.h
+++ b/webkit/fileapi/media/picasa/pmp_test_helper.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
+#include "webkit/fileapi/media/picasa/pmp_constants.h"
 
 namespace base {
 
@@ -32,17 +33,19 @@ class PmpTestHelper {
   template<class T>
   bool WriteColumnFileFromVector(std::string table_name,
                                  std::string column_name,
-                                 const uint16 field_type,
+                                 const PmpFieldType field_type,
                                  std::vector<T> elements_vector);
 
   bool InitColumnReaderFromBytes(PmpColumnReader* const reader,
-                                 std::vector<uint8> data, uint32* rows_read);
+                                 std::vector<uint8> data,
+                                 const PmpFieldType expected_type,
+                                 uint32* rows_read);
 
-  static std::vector<uint8> MakeHeader(const uint16 field_type,
+  static std::vector<uint8> MakeHeader(const PmpFieldType field_type,
                                        const uint32 row_count);
 
   template<class T>
-  static std::vector<uint8> MakeHeaderAndBody(const uint16 field_type,
+  static std::vector<uint8> MakeHeaderAndBody(const PmpFieldType field_type,
                                               const uint32 row_count,
                                               const std::vector<T>& elems);