Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading…

webkit/plugins/ppapi/ppapi_unittest.cc

 // 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.
 
 #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"
 #include "webkit/plugins/ppapi/gfx_conversion.h"
 #include "webkit/plugins/ppapi/mock_plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 namespace webkit {
@@ skipping 50 matching lines @@
   DCHECK(!current_unittest);
   current_unittest = this;
 }
 
 PpapiUnittest::~PpapiUnittest() {
   DCHECK(current_unittest == this);
   current_unittest = NULL;
 }
 
 void PpapiUnittest::SetUp() {
+  message_loop_.reset(new base::MessageLoop());
   delegate_.reset(NewPluginDelegate());
 
   // Initialize the mock module.
   module_ = new PluginModule("Mock plugin", base::FilePath(), this,
                              ::ppapi::PpapiPermissions());
   PluginModule::EntryPoints entry_points;
   entry_points.get_interface = &MockGetInterface;
   entry_points.initialize_module = &MockInitializeModule;
   ASSERT_TRUE(module_->InitAsInternalPlugin(entry_points));
 
   // Initialize the mock instance.
   instance_ = PluginInstance::Create(delegate_.get(), module(), NULL, GURL());
 }
 
 void PpapiUnittest::TearDown() {
   instance_ = NULL;
   module_ = NULL;
+  message_loop_.reset();
 }
 
 MockPluginDelegate* PpapiUnittest::NewPluginDelegate() {
   return new MockPluginDelegate;
 }
 
 const void* PpapiUnittest::GetMockInterface(const char* interface_name) const {
   if (strcmp(interface_name, PPP_INSTANCE_INTERFACE_1_0) == 0)
     return &mock_instance_interface;
   return NULL;
@@ skipping 10 matching lines @@
   instance_->view_data_.rect = PP_FromGfxRect(gfx::Rect(0, 0, width, height));
   instance_->view_data_.clip_rect = instance_->view_data_.rect;
 }
 
 void PpapiUnittest::PluginModuleDead(PluginModule* /* dead_module */) {
   // Nothing needed (this is necessary to make the module compile).
 }
 
 // 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() {}
 
   bool result() {
     return result_;
   }
 
   void reset_result() {
     result_ = false;
   }
 
   static const void* InterfaceFactory(const std::string& interface_name) {
     result_ = true;
     return NULL;
   }
 
  private:
   static bool result_;
-  // ModuleLifetime implementation.
-  virtual void PluginModuleDead(PluginModule* dead_module) {}
 };
 
 bool PpapiCustomInterfaceFactoryTest::result_ = false;
 
 // This test validates whether custom PPAPI interface factories are invoked in
 // response to PluginModule::GetPluginInterface calls.
 TEST_F(PpapiCustomInterfaceFactoryTest, BasicFactoryTest) {
   PpapiInterfaceFactoryManager::GetInstance()->RegisterFactory(
       PpapiCustomInterfaceFactoryTest::InterfaceFactory);
   (*PluginModule::GetLocalGetInterfaceFunc())("DummyInterface");
   EXPECT_TRUE(result());
 
   reset_result();
   PpapiInterfaceFactoryManager::GetInstance()->UnregisterFactory(
       PpapiCustomInterfaceFactoryTest::InterfaceFactory);
 
   (*PluginModule::GetLocalGetInterfaceFunc())("DummyInterface");
   EXPECT_FALSE(result());
 }
 
 }  // namespace ppapi
 }  // namespace webkit