summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/plugin_tests.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 21:39:04 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-01-06 21:39:04 +0000
commit28ab7f9770e0096536e5277c62f5463625f152bd (patch)
treefd7db6edfb8ad20a39944ac3d438d2ca4738c1fb /webkit/tools/test_shell/plugin_tests.cc
parentd7bb1f68d48f5939c9579fbfacd82389096b776c (diff)
downloadchromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.zip
chromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.tar.gz
chromium_src-28ab7f9770e0096536e5277c62f5463625f152bd.tar.bz2
Change "dll" to "plugin" where appropriate.
Review URL: http://codereview.chromium.org/16543 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index a7095dc..36737e4 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -81,11 +81,11 @@ class PluginTest : public TestShellTest {
std::wstring plugin_src = current_directory + L"\\npapi_test_plugin.dll";
ASSERT_TRUE(file_util::PathExists(plugin_src));
- plugin_dll_path_ = current_directory + L"\\plugins";
- ::CreateDirectory(plugin_dll_path_.c_str(), NULL);
+ plugin_file_path_ = current_directory + L"\\plugins";
+ ::CreateDirectory(plugin_file_path_.c_str(), NULL);
- plugin_dll_path_ += L"\\npapi_test_plugin.dll";
- ASSERT_TRUE(CopyFile(plugin_src.c_str(), plugin_dll_path_.c_str(), FALSE));
+ plugin_file_path_ += L"\\npapi_test_plugin.dll";
+ ASSERT_TRUE(CopyFile(plugin_src.c_str(), plugin_file_path_.c_str(), FALSE));
// The plugin list has to be refreshed to ensure that the npapi_test_plugin
// is loaded by webkit.
@@ -105,11 +105,11 @@ class PluginTest : public TestShellTest {
// TODO(iyengar) The DeleteFile call fails in some cases as the plugin is
// still in use. Needs more investigation.
- ::DeleteFile(plugin_dll_path_.c_str());
+ ::DeleteFile(plugin_file_path_.c_str());
}
std::wstring plugin_data_dir_;
- std::wstring plugin_dll_path_;
+ std::wstring plugin_file_path_;
RequestContext* request_context_;
GURL test_url_;
};