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

content/ppapi_plugin/ppapi_thread.cc

Index: content/ppapi_plugin/ppapi_thread.cc
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 004dc39589c2ff43f222491fbb965dd1846eeead..235c2d48a1ba2d63ed650163b8e128d5c17830ac 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -390,6 +390,18 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
   if (is_broker_ || !IsCdm(path))
     cdm_host_files.reset();  // Close all opened files.
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
+
+  // Initialize CDM host verification. On Windows and Mac, this is called
+  // unsandboxed. On Linux, this is called sandboxed.

[Will Harris, 2017/05/01 23:22:49]

where is the linux call now?

Also, does this have to be unsandboxed on Mac, I thought the issue of
translating file handles to files only existed in Windows-land?

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

CDM host verification is disabled on Linux now but this file is generic so it
supports verification on all platforms.
 
I only need this change for Windows. Updated this CL to only affect Windows.

+  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  // BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
 
 #if defined(OS_WIN)
@@ -478,18 +490,6 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path,
       ReportLoadResult(path, INIT_FAILED);
       return;
     }
-#if BUILDFLAG(ENABLE_CDM_HOST_VERIFICATION)
-    // Now the process is sandboxed. Verify CDM host.
-    if (cdm_host_files) {
-      DCHECK(IsCdm(path));
-      if (!cdm_host_files->VerifyFiles(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)
   }
 
   // Initialization succeeded, so keep the plugin DLL loaded.