Revert of media: Simplify CdmHostFile(s)

content/common/media/cdm_host_files.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_COMMON_MEDIA_CDM_HOST_FILES_H_
 #define CONTENT_COMMON_MEDIA_CDM_HOST_FILES_H_
 
 #include <map>
 #include <memory>
 #include <vector>
@@ skipping 54 matching lines @@
   // files later.
   // Only returns false if the CDM returns false (when there's an immediate
   // failure). Otherwise always returns true for backward compatibility, e.g.
   // when using an old CDM which doesn't implement the verification API.
   bool VerifyFiles(base::NativeLibrary cdm_adapter_library,
                    const base::FilePath& cdm_adapter_path);
 
  private:
 #if defined(POSIX_WITH_ZYGOTE)
   // Opens all common files and CDM specific files for all registered CDMs.
-  void OpenFilesForAllRegisteredCdms();
+  bool OpenFilesForAllRegisteredCdms();
 #endif
 
   // Opens all common files and CDM specific files for the CDM adapter
   // registered at |cdm_adapter_path|.
-  void OpenFiles(const base::FilePath& cdm_adapter_path);
+  bool OpenFiles(const base::FilePath& cdm_adapter_path);
 
-  // Opens common CDM host files shared by all CDMs.
-  void OpenCommonFiles();
+  // Opens common CDM host files shared by all CDMs. Upon failure, close all
+  // files opened.
+  bool OpenCommonFiles();
 
   // Opens CDM specific files for the CDM adapter registered at
-  // |cdm_adapter_path|.
-  void OpenCdmFiles(const base::FilePath& cdm_adapter_path);
+  // |cdm_adapter_path|. Returns whether all CDM specific files are opened.
+  // Upon failure, close all files opened.
+  bool OpenCdmFiles(const base::FilePath& cdm_adapter_path);
 
   // Fills |cdm_host_files| with common and CDM specific files for
   // |cdm_adapter_path|. The ownership of those files are also transferred.
-  void TakePlatformFiles(const base::FilePath& cdm_adapter_path,
+  // Returns true upon success where the remaining files will be closed.
+  // Returns false upon any failure and all files will be closed.
+  bool TakePlatformFiles(const base::FilePath& cdm_adapter_path,
                          std::vector<cdm::HostFile>* cdm_host_files);
 
   void CloseAllFiles();
 
   using ScopedFileVector = std::vector<std::unique_ptr<CdmHostFile>>;
   ScopedFileVector common_files_;
   std::map<base::FilePath, ScopedFileVector> cdm_specific_files_map_;
 };
 
 // Returns whether the |cdm_adapter_path| corresponds to a known CDM.
 bool IsCdm(const base::FilePath& cdm_adapter_path);
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MEDIA_CDM_HOST_FILES_H_