Remove ClosePlatformFile from media galleries.

BUG=322664

Review URL: https://codereview.chromium.org/252683006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266728 0039d316-1c4b-4281-b951-d872f2087c98

chrome/utility/chrome_content_utility_client.cc

@@ -945,9 +945,8 @@ void ChromeContentUtilityClient::OnParseITunesPrefXml(
 void ChromeContentUtilityClient::OnParseIPhotoLibraryXmlFile(
     const IPC::PlatformFileForTransit& iphoto_library_file) {
   iphoto::IPhotoLibraryParser parser;
-  base::PlatformFile file =
-      IPC::PlatformFileForTransitToPlatformFile(iphoto_library_file);
-  bool result = parser.Parse(iapps::ReadPlatformFileAsString(file));
+  base::File file = IPC::PlatformFileForTransitToFile(iphoto_library_file);
+  bool result = parser.Parse(iapps::ReadFileAsString(file.Pass()));
   Send(new ChromeUtilityHostMsg_GotIPhotoLibrary(result, parser.library()));
   ReleaseProcessIfNeeded();
 }
@@ -957,9 +956,8 @@ void ChromeContentUtilityClient::OnParseIPhotoLibraryXmlFile(
 void ChromeContentUtilityClient::OnParseITunesLibraryXmlFile(
     const IPC::PlatformFileForTransit& itunes_library_file) {
   itunes::ITunesLibraryParser parser;
-  base::PlatformFile file =
-      IPC::PlatformFileForTransitToPlatformFile(itunes_library_file);
-  bool result = parser.Parse(iapps::ReadPlatformFileAsString(file));
+  base::File file = IPC::PlatformFileForTransitToFile(itunes_library_file);
+  bool result = parser.Parse(iapps::ReadFileAsString(file.Pass()));
   Send(new ChromeUtilityHostMsg_GotITunesLibrary(result, parser.library()));
   ReleaseProcessIfNeeded();
 }

chrome/utility/media_galleries/iapps_xml_utils.cc

@@ -77,28 +77,23 @@ bool ReadInteger(XmlReader* reader, uint64* result) {
   return base::StringToUint64(value, result);
 }
 
-std::string ReadPlatformFileAsString(const base::PlatformFile file) {
+std::string ReadFileAsString(base::File file) {
   std::string result;
-  if (file == base::kInvalidPlatformFileValue)
+  if (!file.IsValid())
     return result;
 
   // A "reasonable" artificial limit.
   // TODO(vandebo): Add a UMA to figure out what common values are.
   const int64 kMaxLibraryFileSize = 150 * 1024 * 1024;
-  base::PlatformFileInfo file_info;
-  if (!base::GetPlatformFileInfo(file, &file_info) ||
-      file_info.size > kMaxLibraryFileSize) {
-    base::ClosePlatformFile(file);
+  base::File::Info file_info;
+  if (!file.GetInfo(&file_info) || file_info.size > kMaxLibraryFileSize)
     return result;
-  }
 
   result.resize(file_info.size);
-  int bytes_read =
-      base::ReadPlatformFile(file, 0, string_as_array(&result), file_info.size);
+  int bytes_read = file.Read(0, string_as_array(&result), file_info.size);
   if (bytes_read != file_info.size)
     result.clear();
 
-  base::ClosePlatformFile(file);
   return result;
 }
 

chrome/utility/media_galleries/iapps_xml_utils.h

@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/platform_file.h"
+#include "base/files/file.h"
 
 class XmlReader;
 
@@ -32,7 +32,7 @@ bool ReadString(XmlReader* reader, std::string* result);
 bool ReadInteger(XmlReader* reader, uint64* result);
 
 // Read in the contents of the given library xml |file| and return as a string.
-std::string ReadPlatformFileAsString(const base::PlatformFile file);
+std::string ReadFileAsString(base::File file);
 
 }  // namespace iapps