Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: webkit/tools/test_shell/plugin_tests.cc

Issue 12163003: Add FilePath to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/image_decoder_unittest.cc ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/plugin_tests.cc
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index 8a4dbdad681b542a96fc43c695a0a420d8ef00a8..ec352b46e8650e2b84c26d073a39c8f4144b2f9b 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -42,7 +42,7 @@ const char kPluginsDir[] = "plugins";
class PluginTest : public TestShellTest {
public:
PluginTest() {
- FilePath executable_directory;
+ base::FilePath executable_directory;
PathService::Get(base::DIR_EXE, &executable_directory);
plugin_src_ = executable_directory.AppendASCII(TEST_PLUGIN_NAME);
CHECK(file_util::PathExists(plugin_src_));
@@ -69,8 +69,8 @@ class PluginTest : public TestShellTest {
TestShellTest::SetUp();
}
- FilePath plugin_src_;
- FilePath plugin_file_path_;
+ base::FilePath plugin_src_;
+ base::FilePath plugin_file_path_;
};
// Tests navigator.plugins.refresh() works.
@@ -126,7 +126,7 @@ TEST_F(PluginTest, Refresh) {
// Tests that if a frame is deleted as a result of calling NPP_HandleEvent, we
// don't crash.
TEST_F(PluginTest, DeleteFrameDuringEvent) {
- FilePath test_html = data_dir_;
+ base::FilePath test_html = data_dir_;
test_html = test_html.AppendASCII(kPluginsDir);
test_html = test_html.AppendASCII("delete_frame.html");
test_shell_->LoadFile(test_html);
@@ -144,7 +144,7 @@ TEST_F(PluginTest, DeleteFrameDuringEvent) {
// Tests that a forced reload of the plugin will not crash.
TEST_F(PluginTest, ForceReload) {
- FilePath test_html = data_dir_;
+ base::FilePath test_html = data_dir_;
test_html = test_html.AppendASCII(kPluginsDir);
test_html = test_html.AppendASCII("force_reload.html");
test_shell_->LoadFile(test_html);
@@ -174,7 +174,7 @@ BOOL CALLBACK EnumChildProc(HWND hwnd, LPARAM lparam) {
#endif
TEST_F(PluginTest, MAYBE_PluginVisibilty) {
- FilePath test_html = data_dir_;
+ base::FilePath test_html = data_dir_;
test_html = test_html.AppendASCII(kPluginsDir);
test_html = test_html.AppendASCII("plugin_visibility.html");
test_shell_->LoadFile(test_html);
« no previous file with comments | « webkit/tools/test_shell/image_decoder_unittest.cc ('k') | webkit/tools/test_shell/run_all_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698