Merge 70785 - Disable sandboxed plugin for WinXP...

chrome/common/sandbox_policy.cc

 // Copyright (c) 2010 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/sandbox_policy.h"
 
 #include <string>
 
 #include "app/win_util.h"
 #include "base/command_line.h"
@@ skipping 514 matching lines @@
       (type != ChildProcessInfo::NACL_BROKER_PROCESS) &&
       (type != ChildProcessInfo::GPU_PROCESS) &&
       (type != ChildProcessInfo::PLUGIN_PROCESS);
 
   // Second case: If it is the plugin process then it depends on it being
   // the built-in flash, the user forcing plugins into sandbox or the
   // the user explicitly excluding flash from the sandbox.
   if (!in_sandbox && (type == ChildProcessInfo::PLUGIN_PROCESS)) {
       in_sandbox = browser_command_line.HasSwitch(switches::kSafePlugins) ||
           (IsBuiltInFlash(cmd_line, NULL) &&
+           (base::win::GetVersion() > base::win::VERSION_XP) &&
            !browser_command_line.HasSwitch(switches::kDisableFlashSandbox));
   }
 
   if (browser_command_line.HasSwitch(switches::kNoSandbox)) {
     // The user has explicity opted-out from all sandboxing.
     in_sandbox = false;
   }
 
 #if !defined (GOOGLE_CHROME_BUILD)
   if (browser_command_line.HasSwitch(switches::kInProcessPlugins)) {
@@ skipping 85 matching lines @@
 
   // Help the process a little. It can't start the debugger by itself if
   // the process is in a sandbox.
   if (child_needs_help)
     base::debug::SpawnDebuggerOnProcess(target.dwProcessId);
 
   return process;
 }
 
 }  // namespace sandbox