Index: webkit/plugins/ppapi/ppapi_unittest.cc |
=================================================================== |
--- webkit/plugins/ppapi/ppapi_unittest.cc (revision 195684) |
+++ webkit/plugins/ppapi/ppapi_unittest.cc (working copy) |
@@ -4,6 +4,7 @@ |
#include "webkit/plugins/ppapi/ppapi_unittest.h" |
+#include "base/message_loop.h" |
#include "ppapi/c/pp_var.h" |
#include "ppapi/c/ppp_instance.h" |
#include "ppapi/shared_impl/ppapi_permissions.h" |
@@ -74,6 +75,7 @@ |
} |
void PpapiUnittest::SetUp() { |
+ message_loop_.reset(new base::MessageLoop()); |
delegate_.reset(NewPluginDelegate()); |
// Initialize the mock module. |
@@ -91,6 +93,7 @@ |
void PpapiUnittest::TearDown() { |
instance_ = NULL; |
module_ = NULL; |
+ message_loop_.reset(); |
} |
MockPluginDelegate* PpapiUnittest::NewPluginDelegate() { |
@@ -121,9 +124,7 @@ |
// Tests whether custom PPAPI interface factories are called when PPAPI |
// interfaces are requested. |
-class PpapiCustomInterfaceFactoryTest |
- : public testing::Test, |
- public webkit::ppapi::PluginDelegate::ModuleLifetime { |
+class PpapiCustomInterfaceFactoryTest : public PpapiUnittest { |
public: |
PpapiCustomInterfaceFactoryTest() {} |
virtual ~PpapiCustomInterfaceFactoryTest() {} |
@@ -143,8 +144,6 @@ |
private: |
static bool result_; |
- // ModuleLifetime implementation. |
- virtual void PluginModuleDead(PluginModule* dead_module) {} |
}; |
bool PpapiCustomInterfaceFactoryTest::result_ = false; |