Remove Legacy NPAPI Flash Sandbox support

content/plugin/plugin_main.cc

Index: content/plugin/plugin_main.cc
===================================================================
--- content/plugin/plugin_main.cc	(revision 159496)
+++ content/plugin/plugin_main.cc	(working copy)
@@ -41,56 +41,6 @@
 void WorkaroundFlashLAHF();
 #endif
 
-#if defined(OS_WIN)
-// This function is provided so that the built-in flash can lock down the
-// sandbox by calling DelayedLowerToken(0).
-extern "C" DWORD __declspec(dllexport) __stdcall DelayedLowerToken(void* ts) {
-  // s_ts is only set the first time the function is called, which happens
-  // in PluginMain.
-  static sandbox::TargetServices* s_ts =
-      reinterpret_cast<sandbox::TargetServices*>(ts);
-  if (ts)
-    return 0;
-  s_ts->LowerToken();
-  return 1;
-};
-
-// Returns true if the plugin to be loaded is the internal flash.
-bool IsPluginBuiltInFlash(const CommandLine& cmd_line) {
-  FilePath path =  cmd_line.GetSwitchValuePath(switches::kPluginPath);
-  return (path.BaseName() == FilePath(L"gcswf32.dll"));
-}
-
-// Before we lock down the flash sandbox, we need to activate the IME machinery
-// and attach it to this process. (Windows attaches an IME machinery to this
-// process automatically while it creates its first top-level window.) After
-// lock down it seems it is unable to start. Note that we leak the IME context
-// on purpose.
-HWND g_ime_window = NULL;
-
-int PreloadIMEForFlash() {
-  HIMC imc = ::ImmCreateContext();
-  if (!imc)
-    return 0;
-  if (::ImmGetOpenStatus(imc))
-    return 1;
-  if (!g_ime_window) {
-    g_ime_window = CreateWindowEx(WS_EX_TOOLWINDOW, L"EDIT", L"", WS_POPUP,
-        0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);
-    SetWindowLongPtr(g_ime_window, GWL_EXSTYLE, WS_EX_NOACTIVATE);
-  }
-  return 2;
-}
-
-void DestroyIMEForFlash() {
-  if (g_ime_window) {
-    DestroyWindow(g_ime_window);
-    g_ime_window = NULL;
-  }
-}
-
-#endif
-
 // main() routine for running as the plugin process.
 int PluginMain(const content::MainFunctionParams& parameters) {
   // The main thread of the plugin services UI.
@@ -114,26 +64,6 @@
   WorkaroundFlashLAHF();
 #endif
 
-#elif defined(OS_WIN)
-  sandbox::TargetServices* target_services =
-      parameters.sandbox_info->target_services;
-
-  CoInitialize(NULL);

[cpu_(ooo_6.6-7.5), 2012/10/04 17:46:40]

I am not sure about the CoInitialize removal, but if it works, great. Did I put
it there?

[jschuh, 2012/10/04 22:14:53]

Good call. I erroneously thought it was for IME warmup, but it turns out we've
always had it. I'll leave it behind to be safe.

-  DVLOG(1) << "Started plugin with "
-           << parsed_command_line.GetCommandLineString();
-
-  HMODULE sandbox_test_module = NULL;
-  bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
-
-  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
   if (parsed_command_line.HasSwitch(switches::kPluginStartupDialog)) {
     ChildProcess::WaitForDebugger("Plugin");
@@ -142,49 +72,8 @@
   {
     ChildProcess plugin_process;
     plugin_process.set_main_thread(new PluginThread());
-#if defined(OS_WIN)
-    if (!no_sandbox && target_services) {
-      // We are sandboxing the plugin. If it is a generic plug-in, we lock down
-      // the sandbox right away, but if it is the built-in flash we let flash
-      // start elevated and it will call DelayedLowerToken(0) when it's ready.
-      if (IsPluginBuiltInFlash(parsed_command_line)) {
-        DVLOG(1) << "Sandboxing flash";
-
-        if (!PreloadIMEForFlash())
-          DVLOG(1) << "IME preload failed";
-        DelayedLowerToken(target_services);
-      } else {
-        target_services->LowerToken();
-      }
-    }
-    if (sandbox_test_module) {
-      RunPluginTests run_security_tests =
-          reinterpret_cast<RunPluginTests>(GetProcAddress(sandbox_test_module,
-                                                          kPluginTestCall));
-      DCHECK(run_security_tests);
-      if (run_security_tests) {
-        int test_count = 0;
-        DVLOG(1) << "Running plugin security tests";
-        BOOL result = run_security_tests(&test_count);
-        DCHECK(result) << "Test number " << test_count << " has failed.";
-        // If we are in release mode, crash or debug the process.
-        if (!result) {
-          __debugbreak();
-          _exit(1);
-        }
-      }
-
-      FreeLibrary(sandbox_test_module);
-    }
-#endif
-
     MessageLoop::current()->Run();
   }
 
-#if defined(OS_WIN)
-  DestroyIMEForFlash();
-  CoUninitialize();
-#endif
-
   return 0;
 }