PicasaAlbumTableReader for Media Galleries API

webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc

Index: webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc
diff --git a/webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc b/webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc
index ee9eef06b2cc4bf840e7ac29cdc666baebf7477b..2d0a542cdce7d5113118e9807b0c9777a764fc42 100644
--- a/webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc
+++ b/webkit/fileapi/media/picasa/pmp_table_reader_unittest.cc
@@ -32,7 +32,7 @@ TEST(PmpTableReaderTest, RowCountAndFieldType) {
   const std::vector<uint32> uint32s_vector(30, 42);
   const std::vector<double> doubles_vector(20, 0.5);
 
-  uint16 column_field_types[] = {
+  picasaimport::PmpFieldType column_field_types[] = {
       picasaimport::PMP_STRING_TYPE,
       picasaimport::PMP_UINT32_TYPE,
       picasaimport::PMP_DOUBLE64_TYPE
@@ -60,18 +60,17 @@ TEST(PmpTableReaderTest, RowCountAndFieldType) {
   ASSERT_TRUE(test_helper.WriteColumnFileFromVector(
       table_name, column_names[2], column_field_types[2], doubles_vector));
 
-  picasaimport::PmpTableReader table_reader;
-  ASSERT_TRUE(table_reader.Init(
-      table_name, test_helper.GetTempDirPath(), column_names));
+  picasaimport::PmpTableReader table_reader(table_name,
+                                            test_helper.GetTempDirPath());
 
-  EXPECT_EQ(max_rows, table_reader.RowCount());
-
-  const std::vector<const picasaimport::PmpColumnReader*> column_readers =
-      table_reader.GetColumns();
+  ASSERT_TRUE(table_reader.Init());
 
-  for(int i = 0; i < 3; i++) {
-    EXPECT_EQ(column_field_types[i], column_readers[i]->field_type());
+  for(unsigned int i = 0; i < column_names.size(); i++) {
+    ASSERT_TRUE(
+        table_reader.AddColumn(column_names[i], column_field_types[i]) != NULL);
   }
+
+  EXPECT_EQ(max_rows, table_reader.RowCount());
 }
 
 }  // namespace