More filesystem cleanup: convert URL-encoded-as-FilePath to actual URL, where

possible without WebKit API changes. The WebKit changes will happen in another 
CL. 

This is a resubmit of http://codereview.chromium.org/6767010/, which bounced
recently. There are a few changes here that weren't there [most notably in
file_system_operation_write_unittest.cc and file_system_operation.cc], but
they're pretty trivial build/test fixes.
Review URL: http://codereview.chromium.org/6833007

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

1 files changed, 17 insertions, 7 deletions

diff --git a/webkit/fileapi/file_system_operation_write_unittest.cc b/webkit/fileapi/file_system_operation_write_unittest.cc
index 57f72fc..3c36168 100644
--- a/webkit/fileapi/file_system_operation_write_unittest.cc
+++ b/webkit/fileapi/file_system_operation_write_unittest.cc
@@ -10,7 +10,6 @@
 
 #include "webkit/fileapi/file_system_operation.h"
 
-#include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
@@ -61,6 +60,16 @@ class FileSystemOperationWriteTest : public testing::Test {
   virtual void TearDown();
 
  protected:
+  GURL URLForRelativePath(const std::string& path) const {
+    // Only the path will actually get used.
+    return GURL("file://").Resolve(file_.value()).Resolve(path);
+  }
+
+  GURL URLForPath(const FilePath& path) const {
+    // Only the path will actually get used.
+    return GURL("file://").Resolve(path.value());
+  }
+
   MessageLoop loop_;
 
   ScopedTempDir dir_;
@@ -122,7 +131,7 @@ class MockDispatcher : public FileSystemCallbackDispatcher {
     ADD_FAILURE();
   }
 
-  virtual void DidOpenFileSystem(const std::string&, const FilePath&) {
+  virtual void DidOpenFileSystem(const std::string&, const GURL&) {
     ADD_FAILURE();
   }
 
@@ -170,7 +179,7 @@ TEST_F(FileSystemOperationWriteTest, TestWriteSuccess) {
   url_request_context->blob_storage_controller()->
       RegisterBlobUrl(blob_url, blob_data);
 
-  operation()->Write(url_request_context, file_, blob_url, 0);
+  operation()->Write(url_request_context, URLForPath(file_), blob_url, 0);
   MessageLoop::current()->Run();
 
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);
@@ -190,7 +199,7 @@ TEST_F(FileSystemOperationWriteTest, TestWriteZero) {
   url_request_context->blob_storage_controller()->
       RegisterBlobUrl(blob_url, blob_data);
 
-  operation()->Write(url_request_context, file_, blob_url, 0);
+  operation()->Write(url_request_context, URLForPath(file_), blob_url, 0);
   MessageLoop::current()->Run();
 
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);
@@ -204,7 +213,8 @@ TEST_F(FileSystemOperationWriteTest, TestWriteInvalidBlobUrl) {
   scoped_refptr<TestURLRequestContext> url_request_context(
       new TestURLRequestContext());
 
-  operation()->Write(url_request_context, file_, GURL("blob:invalid"), 0);
+  operation()->Write(url_request_context, URLForPath(file_),
+      GURL("blob:invalid"), 0);
   MessageLoop::current()->Run();
 
   EXPECT_EQ(0, bytes_written());
@@ -223,7 +233,7 @@ TEST_F(FileSystemOperationWriteTest, TestWriteInvalidFile) {
       RegisterBlobUrl(blob_url, blob_data);
 
   operation()->Write(url_request_context,
-                     FilePath(FILE_PATH_LITERAL("/nonexist")), blob_url, 0);
+                     URLForRelativePath("nonexist"), blob_url, 0);
   MessageLoop::current()->Run();
 
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);
@@ -243,7 +253,7 @@ TEST_F(FileSystemOperationWriteTest, TestWriteDir) {
   url_request_context->blob_storage_controller()->
       RegisterBlobUrl(blob_url, blob_data);
 
-  operation()->Write(url_request_context, dir_.path(), blob_url, 0);
+  operation()->Write(url_request_context, URLForPath(dir_.path()), blob_url, 0);
   MessageLoop::current()->Run();
 
   url_request_context->blob_storage_controller()->UnregisterBlobUrl(blob_url);