Index: content/browser/plugin_loader_posix_unittest.cc |
=================================================================== |
--- content/browser/plugin_loader_posix_unittest.cc (revision 115278) |
+++ content/browser/plugin_loader_posix_unittest.cc (working copy) |
@@ -74,7 +74,7 @@ |
} |
virtual void SetUp() OVERRIDE { |
- PluginService::GetInstance()->Init(); |
+ PluginServiceImpl::GetInstance()->Init(); |
} |
MessageLoop* message_loop() { return &message_loop_; } |
@@ -104,7 +104,7 @@ |
TEST_F(PluginLoaderPosixTest, QueueRequests) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
EXPECT_EQ(0u, plugin_loader()->number_of_pending_callbacks()); |
@@ -131,7 +131,7 @@ |
TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoads) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); |
@@ -172,7 +172,7 @@ |
TEST_F(PluginLoaderPosixTest, TwoFailures) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); |
@@ -211,7 +211,7 @@ |
TEST_F(PluginLoaderPosixTest, CrashedProcess) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); |
@@ -244,7 +244,7 @@ |
TEST_F(PluginLoaderPosixTest, InternalPlugin) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); |
@@ -293,7 +293,7 @@ |
TEST_F(PluginLoaderPosixTest, AllCrashed) { |
int did_callback = 0; |
- PluginService::GetPluginsCallback callback = |
+ content::PluginService::GetPluginsCallback callback = |
base::Bind(&VerifyCallback, base::Unretained(&did_callback)); |
plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); |