| Index: chrome/browser/component_updater/test/component_installers_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/component_updater/test/component_installers_unittest.cc (revision 185808)
|
| +++ chrome/browser/component_updater/test/component_installers_unittest.cc (working copy)
|
| @@ -38,8 +38,15 @@
|
| #endif
|
| }
|
|
|
| +// TODO(jschuh): Get Pepper Flash supported on Win64 build. crbug.com/179716
|
| +#if defined(OS_WIN) && 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, PepperFlashCheck) {
|
| +TEST(ComponentInstallerTest, MAYBE_PepperFlashCheck) {
|
| MessageLoop message_loop;
|
| content::TestBrowserThread ui_thread(BrowserThread::UI, &message_loop);
|
|
|
|
|