summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/pepper_devices_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 04:25:01 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 04:25:01 +0000
commit53900d507cd50344c2e73bb988671044f1787911 (patch)
tree7cd58934003dc610f544f8e682ac8c6040715f65 /chrome/renderer/pepper_devices_unittest.cc
parent047e07212c7da949be3107a70e3fe9ecb160d818 (diff)
downloadchromium_src-53900d507cd50344c2e73bb988671044f1787911.zip
chromium_src-53900d507cd50344c2e73bb988671044f1787911.tar.gz
chromium_src-53900d507cd50344c2e73bb988671044f1787911.tar.bz2
Implement more of Flush properly. This adds support for waiting on the message
loop so we can now enforce that there is only one pending Flush at a time. Also removes the ability to have multiple flushes pending at the same time. TEST=covered by ppapi unit test BUG=none Review URL: http://codereview.chromium.org/2862002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49899 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/pepper_devices_unittest.cc')
-rw-r--r--chrome/renderer/pepper_devices_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/renderer/pepper_devices_unittest.cc b/chrome/renderer/pepper_devices_unittest.cc
index c3903b3..9327ed0 100644
--- a/chrome/renderer/pepper_devices_unittest.cc
+++ b/chrome/renderer/pepper_devices_unittest.cc
@@ -182,7 +182,7 @@ void PepperDeviceTest::SetUp() {
// Normally the RenderView creates the pepper plugin and registers it with
// its internal list. Since we're creating it manually, we have to reach in
// and register it to prevent tear-down from asserting.
- view_->current_pepper_plugins_.insert(pepper_plugin_);
+ view_->current_oldstyle_pepper_plugins_.insert(pepper_plugin_);
active_tests[npp()] = this;