Disable bundled Pepper Flash on Linux on the 1084 branch.

chrome_content_client.cc

Index: chrome_content_client.cc
===================================================================
--- chrome_content_client.cc	(revision 130474)
+++ chrome_content_client.cc	(working copy)
@@ -216,13 +216,8 @@
   } else {
     // Use the bundled Pepper Flash if it's enabled and available.
     // It's currently only enabled by default on Linux ia32 and x64.
-#if defined(FLAPPER_AVAILABLE) && defined(OS_LINUX) && \
-    (defined(ARCH_CPU_X86) || defined(ARCH_CPU_X86_64))
-    bool bundled_flapper_enabled = true;
-#else
     bool bundled_flapper_enabled = CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBundledPpapiFlash);
-#endif
     bundled_flapper_enabled &= !CommandLine::ForCurrentProcess()->HasSwitch(
                                    switches::kDisableBundledPpapiFlash);
     if (!bundled_flapper_enabled)