String->URL cleanup, chromium-side.

content/common/file_system/webfilesystem_callback_dispatcher.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
 #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(
     WebFileSystemCallbacks* callbacks)
     : callbacks_(callbacks) {
   DCHECK(callbacks_);
 }
 
 void WebFileSystemCallbackDispatcher::DidSucceed() {
   callbacks_->didSucceed();
@@ skipping 19 matching lines @@
   for (size_t i = 0; i < entries.size(); i++) {
     file_system_entries[i].name =
         webkit_glue::FilePathStringToWebString(entries[i].name);
     file_system_entries[i].isDirectory = entries[i].is_directory;
   }
   callbacks_->didReadDirectory(file_system_entries, has_more);
 }
 
 void WebFileSystemCallbackDispatcher::DidOpenFileSystem(
     const std::string& name, const GURL& root) {
-  callbacks_->didOpenFileSystem(
-      UTF8ToUTF16(name), UTF8ToUTF16(root.spec()));
+// 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(
     base::PlatformFileError error_code) {
     callbacks_->didFail(
         webkit_glue::PlatformFileErrorToWebFileError(error_code));
 }
 
 void WebFileSystemCallbackDispatcher::DidWrite(int64 bytes, bool complete) {
   NOTREACHED();
 }