Clean up old dead code.

This is the remains of http://codereview.chromium.org/6904063/, a 4-part commit that stalled with full functionality but before full cleanup because I went on leave.

Reviewers: Tony for webkit/tools/test_shell ownership, Michael for everything else.

BUG=none
TEST=existing filesystem tests


Review URL: http://codereview.chromium.org/7820005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99800 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 115 deletions

diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index c20c0e9..6cfa79d 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -101,13 +101,7 @@ class SimpleFileSystemCallbackDispatcher
     if (!root.is_valid())
       callbacks_->didFail(WebKit::WebFileErrorSecurity);
     else
-// Temporary hack to ease a 4-phase Chromium/WebKit commit.
-#ifdef WEBFILESYSTEMCALLBACKS_USE_URL_NOT_STRING
       callbacks_->didOpenFileSystem(WebString::fromUTF8(name), root);
-#else
-      callbacks_->didOpenFileSystem(
-          WebString::fromUTF8(name), WebString::fromUTF8(root.spec()));
-#endif
   }
 
   virtual void DidFail(base::PlatformFileError error_code) {
@@ -175,65 +169,6 @@ void SimpleFileSystem::OpenFileSystem(
   GetNewOperation(callbacks)->OpenFileSystem(origin_url, type, create);
 }
 
-void SimpleFileSystem::move(const WebString& src_path,
-                            const WebString& dest_path,
-                            WebFileSystemCallbacks* callbacks) {
-  move(GURL(src_path), GURL(dest_path), callbacks);
-}
-
-void SimpleFileSystem::copy(const WebString& src_path,
-                            const WebString& dest_path,
-                            WebFileSystemCallbacks* callbacks) {
-  copy(GURL(src_path), GURL(dest_path), callbacks);
-}
-
-void SimpleFileSystem::remove(const WebString& path,
-                              WebFileSystemCallbacks* callbacks) {
-  remove(GURL(path), callbacks);
-}
-
-void SimpleFileSystem::removeRecursively(const WebString& path,
-                                         WebFileSystemCallbacks* callbacks) {
-  removeRecursively(GURL(path), callbacks);
-}
-
-void SimpleFileSystem::readMetadata(const WebString& path,
-                                    WebFileSystemCallbacks* callbacks) {
-  readMetadata(GURL(path), callbacks);
-}
-
-void SimpleFileSystem::createFile(const WebString& path,
-                                  bool exclusive,
-                                  WebFileSystemCallbacks* callbacks) {
-  createFile(GURL(path), exclusive, callbacks);
-}
-
-void SimpleFileSystem::createDirectory(const WebString& path,
-                                       bool exclusive,
-                                       WebFileSystemCallbacks* callbacks) {
-  createDirectory(GURL(path), exclusive, callbacks);
-}
-
-void SimpleFileSystem::fileExists(const WebString& path,
-                                  WebFileSystemCallbacks* callbacks) {
-  fileExists(GURL(path), callbacks);
-}
-
-void SimpleFileSystem::directoryExists(const WebString& path,
-                                       WebFileSystemCallbacks* callbacks) {
-  directoryExists(GURL(path), callbacks);
-}
-
-void SimpleFileSystem::readDirectory(const WebString& path,
-                                     WebFileSystemCallbacks* callbacks) {
-  readDirectory(GURL(path), callbacks);
-}
-
-WebKit::WebFileWriter* SimpleFileSystem::createFileWriter(
-    const WebString& path, WebKit::WebFileWriterClient* client) {
-  return createFileWriter(GURL(path), client);
-}
-
 void SimpleFileSystem::move(
     const WebURL& src_path,
     const WebURL& dest_path, WebFileSystemCallbacks* callbacks) {
diff --git a/webkit/tools/test_shell/simple_file_system.h b/webkit/tools/test_shell/simple_file_system.h
index 1cd983c..1b4f4ce 100644
--- a/webkit/tools/test_shell/simple_file_system.h
+++ b/webkit/tools/test_shell/simple_file_system.h
@@ -41,81 +41,43 @@ class SimpleFileSystem
     return file_system_context_.get();
   }
 
-  // New WebKit::WebFileSystem overrides.
+  // WebKit::WebFileSystem implementation.
   virtual void move(
       const WebKit::WebURL& src_path,
       const WebKit::WebURL& dest_path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void copy(
       const WebKit::WebURL& src_path,
       const WebKit::WebURL& dest_path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void remove(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void removeRecursively(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void readMetadata(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void createFile(
       const WebKit::WebURL& path,
       bool exclusive,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void createDirectory(
       const WebKit::WebURL& path,
       bool exclusive,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void fileExists(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void directoryExists(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual void readDirectory(
       const WebKit::WebURL& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual WebKit::WebFileWriter* createFileWriter(
-      const WebKit::WebURL& path, WebKit::WebFileWriterClient*);
-
-  // Old WebKit::WebFileSystem overrides, soon to go away.
-  virtual void move(const WebKit::WebString& src_path,
-                    const WebKit::WebString& dest_path,
-                    WebKit::WebFileSystemCallbacks* callbacks);
-  virtual void copy(const WebKit::WebString& src_path,
-                    const WebKit::WebString& dest_path,
-                    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,
-                          bool exclusive,
-                          WebKit::WebFileSystemCallbacks* callbacks);
-  virtual void createDirectory(const WebKit::WebString& path,
-                               bool exclusive,
-                               WebKit::WebFileSystemCallbacks* callbacks);
-  virtual void fileExists(const WebKit::WebString& path,
-                          WebKit::WebFileSystemCallbacks* callbacks);
-  virtual void directoryExists(const WebKit::WebString& path,
-                               WebKit::WebFileSystemCallbacks* callbacks);
-  virtual void readDirectory(const WebKit::WebString& path,
-                             WebKit::WebFileSystemCallbacks* callbacks);
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual WebKit::WebFileWriter* createFileWriter(
-      const WebKit::WebString& path, WebKit::WebFileWriterClient* client);
+      const WebKit::WebURL& path, WebKit::WebFileWriterClient*) OVERRIDE;
 
  private:
   // Helpers.