Disable bundled Pepper Flash on Linux on the 1084 branch.

chrome_content_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_content_client.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 198 matching lines @@
           switches::kPpapiFlashPath);
   if (!flash_path.empty()) {
     plugin.path = FilePath(flash_path);
 
     // Also get the version from the command-line.
     flash_version = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kPpapiFlashVersion);
   } 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)
       return;
 
 #if defined(FLAPPER_AVAILABLE)
     if (!PathService::Get(chrome::FILE_PEPPER_FLASH_PLUGIN, &plugin.path))
       return;
     flash_version = FLAPPER_VERSION_STRING;
 #else
@@ skipping 237 matching lines @@
   DCHECK(sandbox_profile_resource_id);
   if (sandbox_type == CHROME_SANDBOX_TYPE_NACL_LOADER) {
     *sandbox_profile_resource_id = IDR_NACL_SANDBOX_PROFILE;
     return true;
   }
   return false;
 }
 #endif
 
 }  // namespace chrome