summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/plugin_main.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 59f3a7b..4bf2d8f 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -141,7 +141,9 @@ int PluginMain(const content::MainFunctionParams& parameters) {
// Warm up the device enumerator for webcam and microphone.
base::win::ScopedComPtr<ICreateDevEnum> device_enumerator;
- device_enumerator.CreateInstance(CLSID_SystemDeviceEnum);
+ device_enumerator.CreateInstance(CLSID_SystemDeviceEnum, NULL,
+ CLSCTX_INPROC_SERVER |
+ CLSCTX_INPROC_HANDLER);
DelayedLowerToken(target_services);
} else {