| Index: chrome/common/pepper_flash.cc
|
| diff --git a/chrome/common/pepper_flash.cc b/chrome/common/pepper_flash.cc
|
| index b21d4d12197cf33c99431bba711cf2c3aac51abc..da1c00de65519dee1f77c0f9d5d7011c836b91ac 100644
|
| --- a/chrome/common/pepper_flash.cc
|
| +++ b/chrome/common/pepper_flash.cc
|
| @@ -117,14 +117,10 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
|
| if (os != kPepperFlashOperatingSystem)
|
| return false;
|
|
|
| -// On Win64, PepperFlash manifests have "ia32" instead of "x64" so skip the
|
| -// architecture check. TODO(wfh): remove this when crbug.com/458894 is fixed.
|
| -#if !defined(OS_WIN) || !defined(ARCH_CPU_X86_64)
|
| std::string arch;
|
| manifest.GetStringASCII("x-ppapi-arch", &arch);
|
| if (arch != kPepperFlashArch)
|
| return false;
|
| -#endif
|
|
|
| *version_out = version;
|
| return true;
|
|
|