Implement more of Flush properly. This adds support for waiting on the messag...

chrome/renderer/pepper_devices_unittest.cc

 // Copyright (c) 2010 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 <map>
 #include <vector>
 
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/common/render_messages.h"
@@ skipping 164 matching lines @@
   pepper_plugin_ = WebPluginDelegatePepper::Create(
       plugin_path(), kTestPluginMimeType, view_->AsWeakPtr());
   ASSERT_TRUE(pepper_plugin_);
   ASSERT_TRUE(pepper_plugin_->Initialize(GURL(), std::vector<std::string>(),
                                          std::vector<std::string>(),
                                          plugin_.get(), false));
 
   // 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;
 
   // Need to specify a window size or graphics calls will fail on the 0x0
   // bitmap.
   gfx::Rect rect(0, 0, 100, 100);
   view_->OnResize(rect.size(), gfx::Rect());
   pepper_plugin_->UpdateGeometry(rect, rect);
 }
 
@@ skipping 74 matching lines @@
   EXPECT_EQ(NPERR_NO_ERROR,
             pepper_plugin()->DeviceAudioInitializeContext(&config, &context));
   EXPECT_TRUE(render_thread_.sink().GetFirstMessageMatching(
       ViewHostMsg_CreateAudioStream::ID));
   EXPECT_EQ(NPERR_NO_ERROR,
             pepper_plugin()->DeviceAudioDestroyContext(&context));
   EXPECT_TRUE(render_thread_.sink().GetFirstMessageMatching(
       ViewHostMsg_CloseAudioStream::ID));
 }