Skip to content

GitLab

T
tangled
Commit 008a278f authored by shess@chromium.org's avatar shess@chromium.org
Browse files
Options

[mac,win] Enable checking for 64-bit Pepper Flash 

BUG=225777,179716
TEST=unit tests pass

Review URL: https://codereview.chromium.org/394923005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284724 0039d316-1c4b-4281-b951-d872f2087c98
parent 52263318
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 13 deletions
chrome/browser/component_updater/test/component_installers_unittest.cc
View file @ 008a278f
......@@ -26,9 +26,21 @@ namespace {
// File name of the Pepper Flash plugin on different platforms.
const base::FilePath::CharType kDataPath[] =
#if defined(OS_MACOSX)
#if defined(ARCH_CPU_X86)
FILE_PATH_LITERAL("components/flapper/mac");
#elif defined(ARCH_CPU_X86_64)
FILE_PATH_LITERAL("components/flapper/mac_x64");
#else
FILE_PATH_LITERAL("components/flapper/NONEXISTENT");
#endif
#elif defined(OS_WIN)
#if defined(ARCH_CPU_X86)
FILE_PATH_LITERAL("components\\flapper\\windows");
#elif defined(ARCH_CPU_X86_64)
FILE_PATH_LITERAL("components\\flapper\\windows_x64");
#else
FILE_PATH_LITERAL("components\\flapper\\NONEXISTENT");
#endif
#else // OS_LINUX, etc.
#if defined(ARCH_CPU_X86)
FILE_PATH_LITERAL("components/flapper/linux");
......@@ -40,20 +52,8 @@ const base::FilePath::CharType kDataPath[] =
#endif
} // namespace
// TODO(jschuh): Get Pepper Flash supported on Win64 build.
// http://crbug.com/179716
#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
#define MAYBE_PepperFlashCheck DISABLED_PepperFlashCheck
// TODO(avi): Get Pepper Flash supported on the Mac 64 bit build.
// http://crbug.com/225777
#elif defined(OS_MACOSX) && defined(ARCH_CPU_X86_64)
#define MAYBE_PepperFlashCheck DISABLED_PepperFlashCheck
#else
#define MAYBE_PepperFlashCheck PepperFlashCheck
#endif
// TODO(viettrungluu): Separate out into two separate tests; use a test fixture.
TEST(ComponentInstallerTest, MAYBE_PepperFlashCheck) {
TEST(ComponentInstallerTest, PepperFlashCheck) {
base::MessageLoop message_loop;
content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
......
chrome/test/data/components/flapper/mac_x64/manifest.json 0 → 100644
View file @ 008a278f
{
"description": "Pepper Flash Player",
"name": "Flapper",
"version": "11.9.900.170",
"x-flapper-revision": "1232353",
"x-ppapi-arch": "x64",
"x-ppapi-os": "mac",
"x-ppapi-required-interfaces": [
"PPB_AudioConfig;1.1|PPB_AudioConfig;1.0",
"PPB_AudioInput(Dev);0.3|PPB_AudioInput(Dev);0.2",
"PPB_Audio;1.0",
"PPB_BrowserFont_Trusted;1.0",
"PPB_Buffer(Dev);0.4",
"PPB_CharSet(Dev);0.4",
"PPB_Core;1.0",
"PPB_Crypto(Dev);0.1",
"PPB_CursorControl(Dev);0.4",
"PPB_FileChooser(Dev);0.6|PPB_FileChooser(Dev);0.5",
"PPB_FileChooserTrusted;0.6|PPB_FileChooserTrusted;0.5",
"PPB_FileRef;1.0",
"PPB_Flash_Clipboard;5.0|PPB_Flash_Clipboard;4.0",
"PPB_Flash_File_FileRef;2",
"PPB_Flash_File_ModuleLocal;3",
"PPB_Flash_FontFile;0.1|PPB_PDF;1",
"PPB_FlashFullscreen;1.0|PPB_FlashFullscreen;0.1",
"PPB_Flash;13.0|PPB_Flash;12.6|PPB_Flash;12.5|PPB_Flash;12.4",
"PPB_Flash_Menu;0.2",
"PPB_Graphics2D;1.0",
"PPB_Graphics3D;1.0",
"PPB_ImageData;1.0",
"PPB_IMEInputEvent(Dev);0.2|PPB_IMEInputEvent(Dev);0.1",
"PPB_InputEvent;1.0",
"PPB_Instance;1.0",
"PPB_Memory(Dev);0.1",
"PPB_NetAddress_Private;1.1|PPB_NetAddress_Private;1.0|PPB_NetAddress_Private;0.1",
"PPB_OpenGLES2ChromiumMapSub;1.0|PPB_OpenGLES2ChromiumMapSub(Dev);1.0|PPB_GLESChromiumTextureMapping(Dev);0.1",
"PPB_OpenGLES2;1.0",
"PPB_TCPSocket_Private;0.4|PPB_TCPSocket_Private;0.3",
"PPB_TextInput(Dev);0.2|PPB_TextInput(Dev);0.1",
"PPB_UDPSocket_Private;0.4|PPB_UDPSocket_Private;0.3",
"PPB_URLLoader;1.0",
"PPB_URLLoaderTrusted;0.3",
"PPB_URLRequestInfo;1.0",
"PPB_URLResponseInfo;1.0",
"PPB_URLUtil(Dev);0.6",
"PPB_Var;1.1|PPB_Var;1.0",
"PPB_VideoCapture(Dev);0.3|PPB_VideoCapture(Dev);0.2",
"PPB_View;1.0"
]
}
chrome/test/data/components/flapper/windows_x64/manifest.json 0 → 100644
View file @ 008a278f
{
"description": "Pepper Flash Player",
"name": "Flapper",
"version": "11.9.900.170",
"x-flapper-revision": "1232353",
"x-ppapi-arch": "x64",
"x-ppapi-os": "win",
"x-ppapi-required-interfaces": [
"PPB_AudioConfig;1.1|PPB_AudioConfig;1.0",
"PPB_AudioInput(Dev);0.3|PPB_AudioInput(Dev);0.2",
"PPB_Audio;1.0",
"PPB_BrowserFont_Trusted;1.0",
"PPB_Buffer(Dev);0.4",
"PPB_CharSet(Dev);0.4",
"PPB_Core;1.0",
"PPB_Crypto(Dev);0.1",
"PPB_CursorControl(Dev);0.4",
"PPB_FileChooser(Dev);0.6|PPB_FileChooser(Dev);0.5",
"PPB_FileChooserTrusted;0.6|PPB_FileChooserTrusted;0.5",
"PPB_FileRef;1.0",
"PPB_Flash_Clipboard;5.0|PPB_Flash_Clipboard;4.0",
"PPB_Flash_File_FileRef;2",
"PPB_Flash_File_ModuleLocal;3",
"PPB_Flash_FontFile;0.1|PPB_PDF;1",
"PPB_FlashFullscreen;1.0|PPB_FlashFullscreen;0.1",
"PPB_Flash;13.0|PPB_Flash;12.6|PPB_Flash;12.5|PPB_Flash;12.4",
"PPB_Flash_Menu;0.2",
"PPB_Graphics2D;1.0",
"PPB_Graphics3D;1.0",
"PPB_ImageData;1.0",
"PPB_IMEInputEvent(Dev);0.2|PPB_IMEInputEvent(Dev);0.1",
"PPB_InputEvent;1.0",
"PPB_Instance;1.0",
"PPB_Memory(Dev);0.1",
"PPB_NetAddress_Private;1.1|PPB_NetAddress_Private;1.0|PPB_NetAddress_Private;0.1",
"PPB_OpenGLES2ChromiumMapSub;1.0|PPB_OpenGLES2ChromiumMapSub(Dev);1.0|PPB_GLESChromiumTextureMapping(Dev);0.1",
"PPB_OpenGLES2;1.0",
"PPB_TCPSocket_Private;0.4|PPB_TCPSocket_Private;0.3",
"PPB_TextInput(Dev);0.2|PPB_TextInput(Dev);0.1",
"PPB_UDPSocket_Private;0.4|PPB_UDPSocket_Private;0.3",
"PPB_URLLoader;1.0",
"PPB_URLLoaderTrusted;0.3",
"PPB_URLRequestInfo;1.0",
"PPB_URLResponseInfo;1.0",
"PPB_URLUtil(Dev);0.6",
"PPB_Var;1.1|PPB_Var;1.0",
"PPB_VideoCapture(Dev);0.3|PPB_VideoCapture(Dev);0.2",
"PPB_View;1.0"
]
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment