Revert 66022 - Enable sandboxed flash on windows by default....

chrome/plugin/plugin_main.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <objbase.h>
 #include <windows.h>
 #endif
@@ skipping 91 matching lines @@
 
 #elif defined(OS_WIN)
   sandbox::TargetServices* target_services =
       parameters.sandbox_info_.TargetServices();
 
   CoInitialize(NULL);
   DVLOG(1) << "Started plugin with "
            << parsed_command_line.command_line_string();
 
   HMODULE sandbox_test_module = NULL;
-  bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
-
+  bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox) ||
+                    !parsed_command_line.HasSwitch(switches::kSafePlugins);
   if (target_services && !no_sandbox) {
     // The command line might specify a test plugin to load.
     if (parsed_command_line.HasSwitch(switches::kTestSandbox)) {
       std::wstring test_plugin_name =
           parsed_command_line.GetSwitchValueNative(switches::kTestSandbox);
       sandbox_test_module = LoadLibrary(test_plugin_name.c_str());
       DCHECK(sandbox_test_module);
     }
   }
 #endif
@@ skipping 40 matching lines @@
 
     MessageLoop::current()->Run();
   }
 
 #if defined(OS_WIN)
   CoUninitialize();
 #endif
 
   return 0;
 }