PicasaAlbumTableReader for Media Galleries API

webkit/fileapi/media/picasa/pmp_test_helper.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 "webkit/fileapi/media/picasa/pmp_test_helper.h"
 
 #include <iterator>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/fileapi/media/picasa/pmp_column_reader.h"
-#include "webkit/fileapi/media/picasa/pmp_constants.h"
 
 namespace picasaimport {
 
 namespace {
 
 bool WriteToFile(const base::FilePath& path, std::vector<uint8> data) {
   // Cast for usage in WriteFile function
   const char* data_char = reinterpret_cast<const char*>(&data[0]);
   size_t bytes_written = file_util::WriteFile(path, data_char, data.size());
   return (bytes_written == data.size());
@@ skipping 41 matching lines @@
   return temp_dir_.CreateUniqueTempDir();
 }
 
 base::FilePath PmpTestHelper::GetTempDirPath() {
   DCHECK(temp_dir_.IsValid());
   return temp_dir_.path();
 }
 
 template<class T>
 bool PmpTestHelper::WriteColumnFileFromVector(
-    std::string table_name, std::string column_name, const uint16 field_type,
-    std::vector<T> elements_vector) {
+    std::string table_name, std::string column_name,
+    const PmpFieldType field_type, std::vector<T> elements_vector) {
   DCHECK(temp_dir_.IsValid());
 
   std::string file_name = table_name + "_" + column_name + "." + kPmpExtension;
 
 #if defined(OS_WIN)
   base::FilePath path = temp_dir_.path().Append(UTF8ToUTF16(file_name));
 #else
   base::FilePath path = temp_dir_.path().Append(file_name);
 #endif
 
   std::vector<uint8> data = PmpTestHelper::MakeHeaderAndBody(
       field_type, elements_vector.size(), elements_vector);
 
   return WriteToFile(path, data);
 }
 
 // Explicit Instantiation for all the valid types.
 template bool PmpTestHelper::WriteColumnFileFromVector<std::string>(
-    std::string, std::string, const uint16, std::vector<std::string>);
+    std::string, std::string, const PmpFieldType, std::vector<std::string>);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint32>(
-    std::string, std::string, const uint16, std::vector<uint32>);
+    std::string, std::string, const PmpFieldType, std::vector<uint32>);
 template bool PmpTestHelper::WriteColumnFileFromVector<double>(
-    std::string, std::string, const uint16, std::vector<double>);
+    std::string, std::string, const PmpFieldType, std::vector<double>);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint8>(
-    std::string, std::string, const uint16, std::vector<uint8>);
+    std::string, std::string, const PmpFieldType, std::vector<uint8>);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint64>(
-    std::string, std::string, const uint16, std::vector<uint64>);
+    std::string, std::string, const PmpFieldType, std::vector<uint64>);
 
 bool PmpTestHelper::InitColumnReaderFromBytes(
-    PmpColumnReader* const reader, std::vector<uint8> data, uint32* rows_read) {
+    PmpColumnReader* const reader, std::vector<uint8> data,
+    const PmpFieldType expected_type, uint32* rows_read) {
   DCHECK(temp_dir_.IsValid());
 
   base::FilePath temp_path;
 
   if (!file_util::CreateTemporaryFileInDir(temp_dir_.path(), &temp_path) ||
       !WriteToFile(temp_path, data)) {
     return false;
   }
 
-  bool success = reader->Init(temp_path, rows_read);
+  bool success = reader->Init(temp_path, expected_type, rows_read);
 
   file_util::Delete(temp_path, true);
 
   return success;
 
 }
 
 // Return a vector so we don't have to worry about memory management.
-std::vector<uint8> PmpTestHelper::MakeHeader(const uint16 field_type,
+std::vector<uint8> PmpTestHelper::MakeHeader(const PmpFieldType field_type,
                                              const uint32 row_count) {
   std::vector<uint8> header(picasaimport::kPmpHeaderSize);
 
   // Copy in magic bytes.
   memcpy(&header[picasaimport::kPmpMagic1Offset], &picasaimport::kPmpMagic1,
          sizeof(picasaimport::kPmpMagic1));
   memcpy(&header[picasaimport::kPmpMagic2Offset], &picasaimport::kPmpMagic2,
          sizeof(picasaimport::kPmpMagic2));
   memcpy(&header[picasaimport::kPmpMagic3Offset], &picasaimport::kPmpMagic3,
          sizeof(picasaimport::kPmpMagic3));
   memcpy(&header[picasaimport::kPmpMagic4Offset], &picasaimport::kPmpMagic4,
          sizeof(picasaimport::kPmpMagic4));
 
   // Copy in field type.
-  memcpy(&header[picasaimport::kPmpFieldType1Offset],  &field_type, 2);
-  memcpy(&header[picasaimport::kPmpFieldType2Offset], &field_type, 2);
+  uint16 field_type_short = static_cast<uint16>(field_type);
+  memcpy(&header[picasaimport::kPmpFieldType1Offset], &field_type_short,
+         sizeof(uint16));
+  memcpy(&header[picasaimport::kPmpFieldType2Offset], &field_type_short,
+         sizeof(uint16));
 
   // Copy in row count.
-  memcpy(&header[picasaimport::kPmpRowCountOffset], &row_count, 4);
+  memcpy(&header[picasaimport::kPmpRowCountOffset], &row_count, sizeof(uint32));
 
   return header;
 }
 
 template<class T>
 std::vector<uint8> PmpTestHelper::MakeHeaderAndBody(
-    const uint16 field_type, const uint32 row_count,
+    const PmpFieldType field_type, const uint32 row_count,
     const std::vector<T>& elems) {
   return CombinedVectors(PmpTestHelper::MakeHeader(field_type, row_count),
                          Flatten(elems));
 }
 
 // Explicit Instantiation for all the valid types.
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<std::string>(
-    const uint16, const uint32, const std::vector<std::string>&);
+    const PmpFieldType, const uint32, const std::vector<std::string>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint32>(
-    const uint16, const uint32, const std::vector<uint32>&);
+    const PmpFieldType, const uint32, const std::vector<uint32>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<double>(
-    const uint16, const uint32, const std::vector<double>&);
+    const PmpFieldType, const uint32, const std::vector<double>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint8>(
-    const uint16, const uint32, const std::vector<uint8>&);
+    const PmpFieldType, const uint32, const std::vector<uint8>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint64>(
-    const uint16, const uint32, const std::vector<uint64>&);
+    const PmpFieldType, const uint32, const std::vector<uint64>&);
 
 }  // namespace picasaimport