Revert of media: Simplify CdmHostFile(s)

content/browser/zygote_host/zygote_communication_linux.cc

 // Copyright 2015 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 "content/browser/zygote_host/zygote_communication_linux.h"
 
 #include <string.h>
 #include <sys/socket.h>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/path_service.h"
 #include "base/pickle.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
 #include "content/common/zygote_commands_linux.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
+#include "media/base/media_switches.h"
 #include "ui/display/display_switches.h"
 #include "ui/gfx/switches.h"
 
 namespace content {
 
 ZygoteCommunication::ZygoteCommunication()
     : control_fd_(),
       control_lock_(),
       pid_(),
       list_of_running_zygote_children_(),
@@ skipping 218 matching lines @@
       switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling,
       switches::kEnableLogging,  // Support, e.g., --enable-logging=stderr.
       // Need to tell the zygote that it is headless so that we don't try to use
       // the wrong type of main delegate.
       switches::kHeadless,
       // Zygote process needs to know what resources to have loaded when it
       // becomes a renderer process.
       switches::kForceDeviceScaleFactor, switches::kLoggingLevel,
       switches::kNoSandbox, switches::kPpapiInProcess,
       switches::kRegisterPepperPlugins, switches::kV, switches::kVModule,
+      // Need to tell CdmHostFile(s) to ignore missing CDM host files.
+      switches::kIgnoreMissingCdmHostFile,
   };
   cmd_line.CopySwitchesFrom(browser_command_line, kForwardSwitches,
                             arraysize(kForwardSwitches));
 
   GetContentClient()->browser()->AppendExtraCommandLineSwitches(&cmd_line, -1);
 
   pid_ = ZygoteHostImpl::GetInstance()->LaunchZygote(&cmd_line, &control_fd_);
 
   base::Pickle pickle;
   pickle.WriteInt(kZygoteCommandGetSandboxStatus);
@@ skipping 58 matching lines @@
   }
   if (ReadSandboxStatus() == -1) {
     return 0;
   }
   have_read_sandbox_status_word_ = true;
   UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_);
   return sandbox_status_;
 }
 
 }  // namespace content