summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 21:44:35 +0000
committerkinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 21:44:35 +0000
commitc27a5ed3f25971f028dd1baedd73efb59497ceeb (patch)
tree178dbc2db3eec96e696277ffff66effe3281e502 /webkit/tools
parent5e0eb3c58f459bdf9b42d8666a7fef4f475224c5 (diff)
downloadchromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.zip
chromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.tar.gz
chromium_src-c27a5ed3f25971f028dd1baedd73efb59497ceeb.tar.bz2
Revert 61613 - possible culprit for valgrind error. (Support removeRecursively and new copy/move)
BUG=none TEST=none Review URL: http://codereview.chromium.org/3576017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/test_shell/simple_file_system.cc9
-rw-r--r--webkit/tools/test_shell/simple_file_system.h2
2 files changed, 1 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index 411d987..8e059ea 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -133,14 +133,7 @@ void SimpleFileSystem::remove(
const WebString& path, WebFileSystemCallbacks* callbacks) {
FilePath filepath(webkit_glue::WebStringToFilePath(path));
- GetNewOperation(callbacks)->Remove(filepath, false /* recursive */);
-}
-
-void SimpleFileSystem::removeRecursively(
- const WebString& path, WebFileSystemCallbacks* callbacks) {
- FilePath filepath(webkit_glue::WebStringToFilePath(path));
-
- GetNewOperation(callbacks)->Remove(filepath, true /* recursive */);
+ GetNewOperation(callbacks)->Remove(filepath);
}
void SimpleFileSystem::readMetadata(
diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/tools/test_shell/simple_file_system.h
index 031ed8b..2f9eeef 100644
--- a/webkit/tools/test_shell/simple_file_system.h
+++ b/webkit/tools/test_shell/simple_file_system.h
@@ -28,8 +28,6 @@ class SimpleFileSystem : public WebKit::WebFileSystem {
WebKit::WebFileSystemCallbacks* callbacks);
virtual void remove(const WebKit::WebString& path,
WebKit::WebFileSystemCallbacks* callbacks);
- virtual void removeRecursively(const WebKit::WebString& path,
- WebKit::WebFileSystemCallbacks* callbacks);
virtual void readMetadata(const WebKit::WebString& path,
WebKit::WebFileSystemCallbacks* callbacks);
virtual void createFile(const WebKit::WebString& path,