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

chrome/browser/media_galleries/fileapi/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 "chrome/browser/media_galleries/fileapi/picasa/pmp_test_helper.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/file_util.h"
 #include "base/logging.h"
+#include "base/platform_file.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/picasa/pmp_column_reader.h"
 
 namespace picasa {
 
 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]);
@@ skipping 81 matching lines @@
     const std::string&, const PmpFieldType, const std::vector<std::string>&);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint32>(
     const std::string&, const PmpFieldType, const std::vector<uint32>&);
 template bool PmpTestHelper::WriteColumnFileFromVector<double>(
     const std::string&, const PmpFieldType, const std::vector<double>&);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint8>(
     const std::string&, const PmpFieldType, const std::vector<uint8>&);
 template bool PmpTestHelper::WriteColumnFileFromVector<uint64>(
     const std::string&, const PmpFieldType, const std::vector<uint64>&);
 
-bool PmpTestHelper::InitColumnReaderFromBytes(PmpColumnReader* const reader,
-                                              const std::vector<uint8>& data,
-                                              const PmpFieldType expected_type,
-                                              uint32* rows_read) {
+bool PmpTestHelper::InitColumnReaderFromBytes(
+    PmpColumnReader* const reader,
+    const std::vector<uint8>& data,
+    const PmpFieldType expected_type) {
   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, expected_type, rows_read);
+  int flags = base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ;
+  base::PlatformFile platform_file =
+      base::CreatePlatformFile(temp_path, flags, NULL, NULL);
+  if (platform_file == base::kInvalidPlatformFileValue)
+    return false;
 
+  bool read_success = reader->ReadFile(platform_file, expected_type);
+
+  base::ClosePlatformFile(platform_file);
   file_util::Delete(temp_path, true);

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

You probably don't want the second parameter to be true here.

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

Done.

 
-  return success;
-
+  return read_success;
 }
 
 // Return a vector so we don't have to worry about memory management.
 std::vector<uint8> PmpTestHelper::MakeHeader(const PmpFieldType field_type,
                                              const uint32 row_count) {
   std::vector<uint8> header(picasa::kPmpHeaderSize);
 
   // Copy in magic bytes.
   memcpy(&header[picasa::kPmpMagic1Offset], &picasa::kPmpMagic1,
          sizeof(picasa::kPmpMagic1));
@@ skipping 31 matching lines @@
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint32>(
     const PmpFieldType, const uint32, const std::vector<uint32>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<double>(
     const PmpFieldType, const uint32, const std::vector<double>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint8>(
     const PmpFieldType, const uint32, const std::vector<uint8>&);
 template std::vector<uint8> PmpTestHelper::MakeHeaderAndBody<uint64>(
     const PmpFieldType, const uint32, const std::vector<uint64>&);
 
 }  // namespace picasa