diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 00:26:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 00:26:19 +0000 |
| commit | 130757671de6d0dc4b54dd3ef11c1b9eb5f039cc (patch) | |
| tree | 0c92593a755e31425f69d8c3c345fff10287c4ce /content/browser/plugin_loader_posix_unittest.cc | |
| parent | 375abf5c85ab185e3d659cde1e585aff2f8e6b3a (diff) | |
| download | chromium_src-130757671de6d0dc4b54dd3ef11c1b9eb5f039cc.zip chromium_src-130757671de6d0dc4b54dd3ef11c1b9eb5f039cc.tar.gz chromium_src-130757671de6d0dc4b54dd3ef11c1b9eb5f039cc.tar.bz2 | |
Move the remaning files in content\common to the content namespace.
Review URL: https://codereview.chromium.org/11235068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_loader_posix_unittest.cc')
| -rw-r--r-- | content/browser/plugin_loader_posix_unittest.cc | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/content/browser/plugin_loader_posix_unittest.cc b/content/browser/plugin_loader_posix_unittest.cc index d81a99c..5c8e200 100644 --- a/content/browser/plugin_loader_posix_unittest.cc +++ b/content/browser/plugin_loader_posix_unittest.cc @@ -15,8 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "webkit/plugins/webplugininfo.h" -using content::BrowserThread; -using content::BrowserThreadImpl; +namespace content { class MockPluginLoaderPosix : public PluginLoaderPosix { public: @@ -107,7 +106,7 @@ class PluginLoaderPosixTest : public testing::Test { TEST_F(PluginLoaderPosixTest, QueueRequests) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); EXPECT_EQ(0u, plugin_loader()->number_of_pending_callbacks()); @@ -141,7 +140,7 @@ TEST_F(PluginLoaderPosixTest, QueueRequests) { TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoads) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -182,7 +181,7 @@ TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoads) { TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoadsThenCrash) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -225,7 +224,7 @@ TEST_F(PluginLoaderPosixTest, ThreeSuccessfulLoadsThenCrash) { TEST_F(PluginLoaderPosixTest, TwoFailures) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -264,7 +263,7 @@ TEST_F(PluginLoaderPosixTest, TwoFailures) { TEST_F(PluginLoaderPosixTest, CrashedProcess) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -297,7 +296,7 @@ TEST_F(PluginLoaderPosixTest, CrashedProcess) { TEST_F(PluginLoaderPosixTest, InternalPlugin) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -346,7 +345,7 @@ TEST_F(PluginLoaderPosixTest, InternalPlugin) { TEST_F(PluginLoaderPosixTest, AllCrashed) { int did_callback = 0; - content::PluginService::GetPluginsCallback callback = + PluginService::GetPluginsCallback callback = base::Bind(&VerifyCallback, base::Unretained(&did_callback)); plugin_loader()->LoadPlugins(message_loop()->message_loop_proxy(), callback); @@ -376,3 +375,5 @@ TEST_F(PluginLoaderPosixTest, AllCrashed) { EXPECT_EQ(0u, plugin_loader()->loaded_plugins().size()); } + +} // namespace content |