| Index: content/plugin/plugin_main.cc
|
| ===================================================================
|
| --- content/plugin/plugin_main.cc (revision 126095)
|
| +++ content/plugin/plugin_main.cc (working copy)
|
| @@ -7,9 +7,6 @@
|
| #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"
|
| @@ -25,7 +22,6 @@
|
| #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)
|
| @@ -180,13 +176,6 @@
|
|
|
| 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();
|
|
|