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

6 files changed, 26 insertions, 270 deletions

diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc
index 00c3cdc..39feaf3 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -15,14 +15,12 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "webkit/glue/webkit_glue.h"
 
 using WebKit::WebFileInfo;
 using WebKit::WebFileSystemCallbacks;
 using WebKit::WebFileSystemEntry;
 using WebKit::WebString;
-using WebKit::WebURL;
 using WebKit::WebVector;
 
 WebFileSystemCallbackDispatcher::WebFileSystemCallbackDispatcher(
@@ -62,12 +60,7 @@ void WebFileSystemCallbackDispatcher::DidReadDirectory(
 
 void WebFileSystemCallbackDispatcher::DidOpenFileSystem(
     const std::string& name, const GURL& root) {
-// Temporary hack to ease a 4-phase Chromium/WebKit commit.
-#ifdef WEBFILESYSTEMCALLBACKS_USE_URL_NOT_STRING
   callbacks_->didOpenFileSystem(UTF8ToUTF16(name), root);
-#else
-  callbacks_->didOpenFileSystem(UTF8ToUTF16(name), UTF8ToUTF16(root.spec()));
-#endif
 }
 
 void WebFileSystemCallbackDispatcher::DidFail(
diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/file_system/webfilesystem_impl.cc
index 977bec4..7f7099b 100644
--- a/content/common/file_system/webfilesystem_impl.cc
+++ b/content/common/file_system/webfilesystem_impl.cc
@@ -116,64 +116,3 @@ WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter(
     const WebURL& path, WebKit::WebFileWriterClient* client) {
   return new WebFileWriterImpl(GURL(path), client);
 }
-
-// These are temporary shims to link up the old calls to the new implementation.
-// They'll go away as soon as the webkit side gets updated.
-void WebFileSystemImpl::move(const WebString& src_path,
-                             const WebString& dest_path,
-                             WebFileSystemCallbacks* callbacks) {
-  move(GURL(src_path), GURL(dest_path), callbacks);
-}
-
-void WebFileSystemImpl::copy(const WebString& src_path,
-                             const WebString& dest_path,
-                             WebFileSystemCallbacks* callbacks) {
-  copy(GURL(src_path), GURL(dest_path), callbacks);
-}
-
-void WebFileSystemImpl::remove(const WebString& path,
-                               WebFileSystemCallbacks* callbacks) {
-  remove(GURL(path), callbacks);
-}
-
-void WebFileSystemImpl::removeRecursively(const WebString& path,
-                                          WebFileSystemCallbacks* callbacks) {
-  removeRecursively(GURL(path), callbacks);
-}
-
-void WebFileSystemImpl::readMetadata(const WebString& path,
-                                     WebFileSystemCallbacks* callbacks) {
-  readMetadata(GURL(path), callbacks);
-}
-
-void WebFileSystemImpl::createFile(const WebString& path,
-                                   bool exclusive,
-                                   WebFileSystemCallbacks* callbacks) {
-  createFile(GURL(path), exclusive, callbacks);
-}
-
-void WebFileSystemImpl::createDirectory(const WebString& path,
-                                        bool exclusive,
-                                        WebFileSystemCallbacks* callbacks) {
-  createDirectory(GURL(path), exclusive, callbacks);
-}
-
-void WebFileSystemImpl::fileExists(const WebString& path,
-                                   WebFileSystemCallbacks* callbacks) {
-  fileExists(GURL(path), callbacks);
-}
-
-void WebFileSystemImpl::directoryExists(const WebString& path,
-                                        WebFileSystemCallbacks* callbacks) {
-  directoryExists(GURL(path), callbacks);
-}
-
-void WebFileSystemImpl::readDirectory(const WebString& path,
-                                      WebFileSystemCallbacks* callbacks) {
-  readDirectory(GURL(path), callbacks);
-}
-
-WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter(
-    const WebString& path, WebKit::WebFileWriterClient* client) {
-  return createFileWriter(GURL(path), client);
-}
diff --git a/content/common/file_system/webfilesystem_impl.h b/content/common/file_system/webfilesystem_impl.h
index b28cd1e..c364a6c 100644
--- a/content/common/file_system/webfilesystem_impl.h
+++ b/content/common/file_system/webfilesystem_impl.h
@@ -6,6 +6,7 @@
 #define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
 
 namespace WebKit {
@@ -19,101 +20,43 @@ class WebFileSystemImpl : public WebKit::WebFileSystem {
   WebFileSystemImpl();
   virtual ~WebFileSystemImpl() { }
 
-  // New WebFileSystem overrides.
+  // 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 WebFileSystem overrides, soon to go away.
-  virtual void move(
-      const WebKit::WebString& src_path,
-      const WebKit::WebString& dest_path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void copy(
-      const WebKit::WebString& src_path,
-      const WebKit::WebString& dest_path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void remove(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void removeRecursively(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void readMetadata(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void createFile(
-      const WebKit::WebString& path,
-      bool exclusive,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void createDirectory(
-      const WebKit::WebString& path,
-      bool exclusive,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void fileExists(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void directoryExists(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
-  virtual void readDirectory(
-      const WebKit::WebString& path,
-      WebKit::WebFileSystemCallbacks*);
-
+      WebKit::WebFileSystemCallbacks*) OVERRIDE;
   virtual WebKit::WebFileWriter* createFileWriter(
-      const WebKit::WebString& path, WebKit::WebFileWriterClient*);
+      const WebKit::WebURL& path, WebKit::WebFileWriterClient*) OVERRIDE;
 };
 
 #endif  // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
diff --git a/webkit/fileapi/file_system_util.cc b/webkit/fileapi/file_system_util.cc
index b084930..1314dfc 100644
--- a/webkit/fileapi/file_system_util.cc
+++ b/webkit/fileapi/file_system_util.cc
@@ -36,27 +36,11 @@ bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type,
     return false;
 
   std::string temp = url.path();
-  // TODO(ericu) remove this code when that ceases to be true, which will be as
-  // soon as the WEBFILESYSTEMCALLBACKS_USE_URL_NOT_STRING macro goes into
-  // WebKit.
-  // On Windows, this will have backslashes for now.
-  // url will look something like:
-  //    filesystem:http://example.com/temporary/\dir\file.txt
-  // temp will look something like:
-  //    http://example.com/temporary/\dir\file.txt
-  // On posix, url will look something like:
-  //    filesystem:http://example.com/temporary/dir/file.txt
-  // temp will look something like:
-  //    http://example.com/temporary/dir/file.txt
-  size_t pos = temp.find('\\');
-  for (; pos != std::string::npos; pos = temp.find('\\', pos + 1)) {
-    temp[pos] = '/';
-  }
   // TODO(ericu): This should probably be done elsewhere after the stackable
   // layers are properly in.  We're supposed to reject any paths that contain
   // '..' segments, but the GURL constructor is helpfully resolving them for us.
   // Make sure there aren't any before we call it.
-  pos = temp.find("..");
+  size_t pos = temp.find("..");
   for (; pos != std::string::npos; pos = temp.find("..", pos + 1)) {
     if ((pos == 0 || temp[pos - 1] == '/') &&
         (pos == temp.length() - 2 || temp[pos + 2] == '/'))
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.