Revert USER_LIMITED Flash changes

content/plugin/plugin_main.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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <objbase.h>
 #include <windows.h>
-// Some directx includes can trigger deprecation warnings.
-#pragma warning(disable:4995)
-#include <dshow.h>
 #endif
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/threading/platform_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
-#include "base/win/scoped_comptr.h"
 #include "content/common/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"
 #include "ipc/ipc_descriptors.h"
 #endif
 
 #if defined(OS_MACOSX)
 // Removes our Carbon library interposing from the environment so that it
 // doesn't carry into any processes that plugins might start.
@@ skipping 134 matching lines @@
       if (IsPluginBuiltInFlash(parsed_command_line)) {
         DVLOG(1) << "Sandboxing flash";
 
         // Poke hole in the address space to improve randomization.
         if (!CreateRandomMemoryHole()) {
           DVLOG(ERROR) << "Failed to create random memory hole";
         }
 
         if (!PreloadIMEForFlash())
           DVLOG(1) << "IME preload failed";
-
-        // Warm up the device enumerator for webcam and microphone.
-        base::win::ScopedComPtr<ICreateDevEnum> device_enumerator;
-        device_enumerator.CreateInstance(CLSID_SystemDeviceEnum, NULL,
-                                         CLSCTX_INPROC_SERVER |
-                                         CLSCTX_INPROC_HANDLER);
-
         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);
@@ skipping 15 matching lines @@
 
     MessageLoop::current()->Run();
   }
 
 #if defined(OS_WIN)
   CoUninitialize();
 #endif
 
   return 0;
 }