media: Move the callsite of CdmHostFiles::InitVerification()

content/ppapi_plugin/ppapi_thread.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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <stddef.h>
 
 #include <limits>
 
@@ skipping 372 matching lines @@
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // Open CDM host files before the process is sandboxed.
   if (!is_broker_ && IsCdm(path))
     cdm_host_files = CdmHostFiles::Create(path);
 #elif defined(OS_LINUX)
   cdm_host_files = CdmHostFiles::TakeGlobalInstance();
   if (is_broker_ || !IsCdm(path))
     cdm_host_files.reset();  // Close all opened files.
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
+
+#if defined(OS_WIN)
+  // On Windows, initialize CDM host verification unsandboxed. On other
+  // platforms, this is called sandboxed below.
+  if (cdm_host_files) {
+    DCHECK(IsCdm(path));
+    if (!cdm_host_files->InitVerification(library.get(), path)) {
+      LOG(WARNING) << "CDM host verification failed.";
+      // TODO(xhwang): Add a new load result if needed.
+      ReportLoadResult(path, INIT_FAILED);
+      return;
+    }
+  }
+#endif  // defined(OS_WIN)
 #endif  // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
 
 #if defined(OS_WIN)
   // If code subsequently tries to exit using abort(), force a crash (since
   // otherwise these would be silent terminations and fly under the radar).
   base::win::SetAbortBehaviorForCrashReporting();
 
   // Once we lower the token the sandbox is locked down and no new modules
   // can be loaded. TODO(cpu): consider changing to the loading style of
   // regular plugins.
@@ skipping 60 matching lines @@
       return;
     }
   } else {
 #if defined(OS_MACOSX)
     // We need to do this after getting |PPP_GetInterface()| (or presumably
     // doing something nontrivial with the library), else the sandbox
     // intercedes.
     CHECK(InitializeSandbox());
 #endif
 
-    int32_t init_error = plugin_entry_points_.initialize_module(
-        local_pp_module_,
-        &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
-    if (init_error != PP_OK) {
-      LOG(WARNING) << "InitModule failed with error " << init_error;
-      ReportLoadResult(path, INIT_FAILED);
-      return;
-    }
-#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
-    // Now the process is sandboxed. Verify CDM host.
+#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) && !defined(OS_WIN)
+    // Now we are sandboxed, initialize CDM host verification.
     if (cdm_host_files) {
       DCHECK(IsCdm(path));
-      if (!cdm_host_files->VerifyFiles(library.get(), path)) {
+      if (!cdm_host_files->InitVerification(library.get(), path)) {
         LOG(WARNING) << "CDM host verification failed.";
         // TODO(xhwang): Add a new load result if needed.
         ReportLoadResult(path, INIT_FAILED);
         return;
       }
     }
-#endif  // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
+#endif  // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION) && !defined(OS_WIN)

[xhwang, 2017/05/01 23:57:00]

Move this to be above "initialize_module" to be consistent with Windows. Now we
are always calling InitVerification() before InitializeModule().

+
+    int32_t init_error = plugin_entry_points_.initialize_module(
+        local_pp_module_, &ppapi::proxy::PluginDispatcher::GetBrowserInterface);
+    if (init_error != PP_OK) {
+      LOG(WARNING) << "InitModule failed with error " << init_error;
+      ReportLoadResult(path, INIT_FAILED);
+      return;
+    }
   }
 
   // Initialization succeeded, so keep the plugin DLL loaded.
   library_.Reset(library.Release());
 
   ReportLoadResult(path, LOAD_SUCCESS);
 }
 
 void PpapiThread::OnCreateChannel(base::ProcessId renderer_pid,
                                   int renderer_child_id,
@@ skipping 134 matching lines @@
           GetHistogramName(is_broker_, "LoadTime", path),
           base::TimeDelta::FromMilliseconds(1),
           base::TimeDelta::FromSeconds(10),
           50,
           base::HistogramBase::kUmaTargetedHistogramFlag);
 
   histogram->AddTime(load_time);
 }
 
 }  // namespace content