String->URL cleanup, chromium-side.

content/common/file_system/webfilesystem_impl.cc

Index: content/common/file_system/webfilesystem_impl.cc
diff --git a/content/common/file_system/webfilesystem_impl.cc b/content/common/file_system/webfilesystem_impl.cc
index 38f1d2a0f046841f8766aceed0b0b1c65fb3f8fd..9dcfe2f0c171203b6b5cf3337b2abf7f4f7a006e 100644
--- a/content/common/file_system/webfilesystem_impl.cc
+++ b/content/common/file_system/webfilesystem_impl.cc
@@ -11,19 +11,21 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.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;
 
 WebFileSystemImpl::WebFileSystemImpl() {
 }
 
-void WebFileSystemImpl::move(const WebString& src_path,
-                             const WebString& dest_path,
+void WebFileSystemImpl::move(const WebURL& src_path,
+                             const WebURL& dest_path,
                              WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -32,8 +34,8 @@ void WebFileSystemImpl::move(const WebString& src_path,
                    new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::copy(const WebString& src_path,
-                             const WebString& dest_path,
+void WebFileSystemImpl::copy(const WebURL& src_path,
+                             const WebURL& dest_path,
                              WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -42,7 +44,7 @@ void WebFileSystemImpl::copy(const WebString& src_path,
                    new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::remove(const WebString& path,
+void WebFileSystemImpl::remove(const WebURL& path,
                                WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -51,7 +53,7 @@ void WebFileSystemImpl::remove(const WebString& path,
                      new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::removeRecursively(const WebString& path,
+void WebFileSystemImpl::removeRecursively(const WebURL& path,
                                           WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -60,7 +62,7 @@ void WebFileSystemImpl::removeRecursively(const WebString& path,
                      new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::readMetadata(const WebString& path,
+void WebFileSystemImpl::readMetadata(const WebURL& path,
                                      WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -68,7 +70,7 @@ void WebFileSystemImpl::readMetadata(const WebString& path,
                            new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::createFile(const WebString& path,
+void WebFileSystemImpl::createFile(const WebURL& path,
                                    bool exclusive,
                                    WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
@@ -77,7 +79,7 @@ void WebFileSystemImpl::createFile(const WebString& path,
                      false, new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::createDirectory(const WebString& path,
+void WebFileSystemImpl::createDirectory(const WebURL& path,
                                         bool exclusive,
                                         WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
@@ -86,7 +88,7 @@ void WebFileSystemImpl::createDirectory(const WebString& path,
                      false, new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::fileExists(const WebString& path,
+void WebFileSystemImpl::fileExists(const WebURL& path,
                                    WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -94,7 +96,7 @@ void WebFileSystemImpl::fileExists(const WebString& path,
                      new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::directoryExists(const WebString& path,
+void WebFileSystemImpl::directoryExists(const WebURL& path,
                                         WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -102,7 +104,7 @@ void WebFileSystemImpl::directoryExists(const WebString& path,
                      new WebFileSystemCallbackDispatcher(callbacks));
 }
 
-void WebFileSystemImpl::readDirectory(const WebString& path,
+void WebFileSystemImpl::readDirectory(const WebURL& path,
                                       WebFileSystemCallbacks* callbacks) {
   FileSystemDispatcher* dispatcher =
       ChildThread::current()->file_system_dispatcher();
@@ -111,6 +113,67 @@ void WebFileSystemImpl::readDirectory(const WebString& path,
 }
 
 WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter(
-    const WebString& path, WebKit::WebFileWriterClient* client) {
+    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(WebURL(GURL(src_path)), WebURL(GURL(dest_path)), callbacks);

[darin (slow to review), 2011/05/20 22:40:31]

you shouldn't need to explicitly call the WebURL constructor given a GURL.  that
one happens implicitly.  it would probably help with readability if
WebURL(GURL(...)) were reduced to GURL(...) everywhere.

[ericu, 2011/06/02 00:25:46]

Removed unnecessary WebURL constructors throughout.

+}
+
+void WebFileSystemImpl::copy(const WebString& src_path,
+                             const WebString& dest_path,
+                             WebFileSystemCallbacks* callbacks) {
+  copy(WebURL(GURL(src_path)), WebURL(GURL(dest_path)), callbacks);
+}
+
+void WebFileSystemImpl::remove(const WebString& path,
+                               WebFileSystemCallbacks* callbacks) {
+  remove(WebURL(GURL(path)), callbacks);
+}
+
+void WebFileSystemImpl::removeRecursively(const WebString& path,
+                                          WebFileSystemCallbacks* callbacks) {
+  removeRecursively(WebURL(GURL(path)), callbacks);
+}
+
+void WebFileSystemImpl::readMetadata(const WebString& path,
+                                     WebFileSystemCallbacks* callbacks) {
+  readMetadata(WebURL(GURL(path)), callbacks);
+}
+
+void WebFileSystemImpl::createFile(const WebString& path,
+                                   bool exclusive,
+                                   WebFileSystemCallbacks* callbacks) {
+  createFile(WebURL(GURL(path)), exclusive, callbacks);
+}
+
+void WebFileSystemImpl::createDirectory(const WebString& path,
+                                        bool exclusive,
+                                        WebFileSystemCallbacks* callbacks) {
+  createDirectory(WebURL(GURL(path)), exclusive, callbacks);
+}
+
+void WebFileSystemImpl::fileExists(const WebString& path,
+                                   WebFileSystemCallbacks* callbacks) {
+  fileExists(WebURL(GURL(path)), callbacks);
+}
+
+void WebFileSystemImpl::directoryExists(const WebString& path,
+                                        WebFileSystemCallbacks* callbacks) {
+  directoryExists(WebURL(GURL(path)), callbacks);
+}
+
+void WebFileSystemImpl::readDirectory(const WebString& path,
+                                      WebFileSystemCallbacks* callbacks) {
+  readDirectory(WebURL(GURL(path)), callbacks);
+}
+
+WebKit::WebFileWriter* WebFileSystemImpl::createFileWriter(
+    const WebString& path, WebKit::WebFileWriterClient* client) {
+  return createFileWriter(WebURL(GURL(path)), client);
+}