Clean up old dead code.

webkit/tools/test_shell/simple_file_system.cc

Index: webkit/tools/test_shell/simple_file_system.cc
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index 6b3056319d93298de1bb2b36a11d1ee318d1858e..669137b2cedebcf080e36e57065be11cc1cb5f8d 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -103,13 +103,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) {
@@ -177,65 +171,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) {