Eliminate resource leaks from zip::ZipFiles and

chrome/utility/chrome_content_utility_client.cc

 // Copyright (c) 2012 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/utility/chrome_content_utility_client.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
@@ skipping 231 matching lines @@
 void ChromeContentUtilityClient::OnDecodeImage(
     const std::vector<unsigned char>& encoded_data, bool shrink_to_fit) {
   DecodeImageAndSend(encoded_data, shrink_to_fit);
 }
 
 #if defined(OS_CHROMEOS)
 void ChromeContentUtilityClient::OnCreateZipFile(
     const base::FilePath& src_dir,
     const std::vector<base::FilePath>& src_relative_paths,
     const base::FileDescriptor& dest_fd) {
+  base::File dest_file(dest_fd);

[satorux1, 2014/11/12 07:04:43]

This is needed to close the file descriptor, right?

maybe base::ScopedFD is clearer as its sole purpose is to close the file
descriptor, which we want here. :)

[jeremyspiegel, 2014/11/12 08:52:51]

Yes thanks, that is what I was looking for.

   bool succeeded = true;
 
   // Check sanity of source relative paths. Reject if path is absolute or
   // contains any attempt to reference a parent directory ("../" tricks).
   for (std::vector<base::FilePath>::const_iterator iter =
            src_relative_paths.begin(); iter != src_relative_paths.end();
        ++iter) {
     if (iter->IsAbsolute() || iter->ReferencesParent()) {
       succeeded = false;
       break;
     }
   }
 
   if (succeeded)
-    succeeded = zip::ZipFiles(src_dir, src_relative_paths, dest_fd.fd);
+    succeeded = zip::ZipFiles(
+      src_dir, src_relative_paths, dest_file.GetPlatformFile());
 
   if (succeeded)
     Send(new ChromeUtilityHostMsg_CreateZipFile_Succeeded());
   else
     Send(new ChromeUtilityHostMsg_CreateZipFile_Failed());
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_CHROMEOS)
 
 void ChromeContentUtilityClient::OnRobustJPEGDecodeImage(
@@ skipping 69 matching lines @@
     const std::string& mime_type, int64 total_size, bool get_attached_images) {
   // Only one IPCDataSource may be created and added to the list of handlers.
   metadata::IPCDataSource* source = new metadata::IPCDataSource(total_size);
   handlers_.push_back(source);
 
   metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser(
       source, mime_type, get_attached_images);
   parser->Start(base::Bind(&FinishParseMediaMetadata, base::Owned(parser)));
 }
 #endif