Revert 133472 - Use bundled Pepper Flash on Windows (Canary, still on a field trial).

chrome/common/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"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/pepper_flash.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "content/public/common/url_constants.h"
 #include "grit/common_resources.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_constants.h"
 
-#include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.
+#include "flapper_version.h"  // In <(SHARED_INTERMEDIATE_DIR).
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/sandbox.h"
 #elif defined(OS_MACOSX)
 #include "chrome/common/chrome_sandbox_type_mac.h"
 #endif
 
 namespace {
@@ skipping 165 matching lines @@
   const CommandLine::StringType flash_path =
       CommandLine::ForCurrentProcess()->GetSwitchValueNative(
           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 {
-    // Try to use a bundled Pepper Flash if:
-    //  1) it's forcibly enabled via the command-line;
+    // 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);
-    //  2) it's known to be available at build time and enabled by default; and
-#if defined(FLAPPER_AVAILABLE)
-    bundled_flapper_enabled |= IsPepperFlashEnabledByDefault();
 #endif
-    //  3) it's not forcibly disabled via the command-line.
     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;
     // It is an error to have FLAPPER_AVAILABLE defined but then not having the
     // plugin file in place, but this happens in Chrome OS builds.
@@ skipping 232 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