diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 20:53:26 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 20:53:26 +0000 |
| commit | 7ce540e7b8c0e72a36a10613d56c4f9c08a46bbe (patch) | |
| tree | a241a5e641819f02ba0f90eebd1d52594ec89cfb /content/ppapi_plugin | |
| parent | 9f495465798e8585c4b1bc6081b5bda73decf660 (diff) | |
| download | chromium_src-7ce540e7b8c0e72a36a10613d56c4f9c08a46bbe.zip chromium_src-7ce540e7b8c0e72a36a10613d56c4f9c08a46bbe.tar.gz chromium_src-7ce540e7b8c0e72a36a10613d56c4f9c08a46bbe.tar.bz2 | |
Revert "Check existence of Widevince CDM/Adapter on load failure on Win."
This reverts commit 8bcd56e28c781e796dd53744185c28dfbc15fa38.
The check was originally added to help investigate some issues. See BUG for
details.
BUG=356331
Review URL: https://codereview.chromium.org/244833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265061 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index e2f6a9b..cb0abde 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -53,11 +53,6 @@ #endif #if defined(OS_WIN) - -// TODO(xhwang): Remove after http://crbug.com/345852 is fixed. -const char kWidevineCdmFileName[] = "widevinecdm.dll"; -const char kWidevineCdmAdapterFileName[] = "widevinecdmadapter.dll"; - extern sandbox::TargetServices* g_target_services; // Used by EnumSystemLocales for warming up. @@ -283,18 +278,6 @@ void PpapiThread::OnLoadPlugin(const base::FilePath& path, ReportLoadResult(path, LOAD_FAILED); // Report detailed reason for load failure. ReportLoadErrorCode(path, error); -#if defined(OW_WIN) - // Extra check to help investigate http://crbug.com/345852. This should - // never fail because the paths are checked before registering the - // adapter. - // TODO(xhwang): Remove this after the issue is fixed. See - // http://crbug.com/356331 - if (path.BaseName().MaybeAsASCII() == kWidevineCdmAdapterFileName) { - CHECK(base::PathExists(path)); - CHECK( - base::PathExists(path.DirName().AppendASCII(kWidevineCdmFileName))); - } -#endif return; } |