Support filesystem files from BlobURLRequestJob

webkit/blob/blob_url_request_job_unittest.cc

Index: webkit/blob/blob_url_request_job_unittest.cc
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 3afde19a95c4ea9e0315df7ba66bd32570be2555..812d7fdeababf8b7d51b75f505b429a324e425d8 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/run_loop.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
@@ -27,16 +28,32 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_url_request_job.h"
+#include "webkit/fileapi/file_system_context.h"
+#include "webkit/fileapi/file_system_file_util.h"
+#include "webkit/fileapi/file_system_operation_context.h"
+#include "webkit/fileapi/file_system_task_runners.h"
+#include "webkit/fileapi/file_system_url.h"
+#include "webkit/fileapi/mock_file_system_options.h"
 
 namespace webkit_blob {
 
-static const int kBufferSize = 1024;
-static const char kTestData1[] = "Hello";
-static const char kTestData2[] = "Here it is data.";
-static const char kTestFileData1[] = "0123456789";
-static const char kTestFileData2[] = "This is sample file.";
-static const char kTestContentType[] = "foo/bar";
-static const char kTestContentDisposition[] = "attachment; filename=foo.txt";
+namespace {
+
+const int kBufferSize = 1024;
+const char kTestData1[] = "Hello";
+const char kTestData2[] = "Here it is data.";
+const char kTestFileData1[] = "0123456789";
+const char kTestFileData2[] = "This is sample file.";
+const char kTestFileSystemFileData1[] = "abcdefghijklmnop";
+const char kTestFileSystemFileData2[] = "File system file test data.";
+const char kTestContentType[] = "foo/bar";
+const char kTestContentDisposition[] = "attachment; filename=foo.txt";
+
+const char kFileSystemURLOrigin[] = "http://remote";
+const fileapi::FileSystemType kFileSystemType =
+    fileapi::kFileSystemTypeTemporary;
+
+}  // namespace
 
 class BlobURLRequestJobTest : public testing::Test {
  public:
@@ -46,8 +63,8 @@ class BlobURLRequestJobTest : public testing::Test {
 
   class MockURLRequestDelegate : public net::URLRequest::Delegate {
    public:
-    explicit MockURLRequestDelegate(BlobURLRequestJobTest* test)
-        : test_(test),
+    explicit MockURLRequestDelegate(base::RunLoop* run_loop)
+        : run_loop_(run_loop),
           received_data_(new net::IOBuffer(kBufferSize)) {
     }
 
@@ -98,10 +115,10 @@ class BlobURLRequestJobTest : public testing::Test {
     }
 
     void RequestComplete() {
-      test_->ScheduleNextTask();
+      run_loop_->Quit();
     }
 
-    BlobURLRequestJobTest* test_;
+    base::RunLoop* run_loop_;
     scoped_refptr<net::IOBuffer> received_data_;
     std::string response_data_;
   };
@@ -110,8 +127,11 @@ class BlobURLRequestJobTest : public testing::Test {
   // is spun up once and reused for all tests.
   template <class Method>
   void MethodWrapper(Method method) {
+    MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
     SetUpTest();
     (this->*method)();
+    TearDownTest();
+    test_finished_event_->Signal();
   }
 
   void SetUp() {
@@ -164,92 +184,136 @@ class BlobURLRequestJobTest : public testing::Test {
     test_finished_event_->Wait();
   }
 
+  void SetUpFileSystem() {
+    // Prepare file system.
+    file_system_context_ = new fileapi::FileSystemContext(
+        fileapi::FileSystemTaskRunners::CreateMockTaskRunners(),
+        NULL,
+        NULL,
+        temp_dir_.path(),
+        fileapi::CreateDisallowFileAccessOptions());
+
+    file_system_context_->OpenFileSystem(
+        GURL(kFileSystemURLOrigin),
+        kFileSystemType,
+        true,  // create
+        base::Bind(&BlobURLRequestJobTest::OnValidateFileSystem,
+                   base::Unretained(this)));
+    base::RunLoop run_loop;
+    run_loop.RunUntilIdle();
+    ASSERT_TRUE(file_system_root_url_.is_valid());
+
+    // Prepare files on file system.
+    const char kFilename1[] = "FileSystemFile1.dat";
+    temp_file_system_file1_ = GetFileSystemURL(kFilename1);
+    WriteFileSystemFile(kFilename1, kTestFileSystemFileData1,
+                        arraysize(kTestFileSystemFileData1),
+                        &temp_file_system_file_modification_time1_);
+    const char kFilename2[] = "FileSystemFile2.dat";
+    temp_file_system_file2_ = GetFileSystemURL(kFilename2);
+    WriteFileSystemFile(kFilename2, kTestFileSystemFileData2,
+                        arraysize(kTestFileSystemFileData2),
+                        &temp_file_system_file_modification_time2_);
+  }
+
+  GURL GetFileSystemURL(const std::string& filename) {
+    return GURL(file_system_root_url_.spec() + filename);
+  }
+
+  void WriteFileSystemFile(const std::string& filename,
+                           const char* buf, int buf_size,
+                           base::Time* modification_time) {
+    fileapi::FileSystemURL url(GURL(kFileSystemURLOrigin),
+                               kFileSystemType,
+                               FilePath().AppendASCII(filename));
+
+    fileapi::FileSystemFileUtil* file_util =
+        file_system_context_->GetFileUtil(kFileSystemType);
+
+    fileapi::FileSystemOperationContext context(file_system_context_);
+    context.set_allowed_bytes_growth(1024);
+
+    base::PlatformFile handle = base::kInvalidPlatformFileValue;
+    bool created = false;
+    ASSERT_EQ(base::PLATFORM_FILE_OK, file_util->CreateOrOpen(
+        &context,
+        url,
+        base::PLATFORM_FILE_CREATE | base::PLATFORM_FILE_WRITE,
+        &handle,
+        &created));
+    EXPECT_TRUE(created);
+    ASSERT_NE(base::kInvalidPlatformFileValue, handle);
+    ASSERT_EQ(buf_size,
+        base::WritePlatformFile(handle, 0 /* offset */, buf, buf_size));
+    base::ClosePlatformFile(handle);
+
+    base::PlatformFileInfo file_info;
+    FilePath platform_path;
+    ASSERT_EQ(base::PLATFORM_FILE_OK,
+              file_util->GetFileInfo(&context, url, &file_info,
+                                     &platform_path));
+    if (modification_time)
+      *modification_time = file_info.last_modified;
+  }
+
   void SetUpTest() {
     DCHECK(MessageLoop::current() == io_thread_->message_loop());
 
     net::URLRequest::Deprecated::RegisterProtocolFactory(
         "blob", &BlobURLRequestJobFactory);
-    url_request_delegate_.reset(new MockURLRequestDelegate(this));
+
+    ASSERT_EQ(static_cast<int>(arraysize(kTestFileData1) - 1),
+              file_util::WriteFile(temp_file1_, kTestFileData1,
+                                   arraysize(kTestFileData1) - 1));
   }
 
   void TearDownTest() {
     DCHECK(MessageLoop::current() == io_thread_->message_loop());
 
+    file_system_context_ = NULL;
+
     request_.reset();
-    url_request_delegate_.reset();
 
     DCHECK(!blob_url_request_job_);
     net::URLRequest::Deprecated::RegisterProtocolFactory("blob", NULL);
   }
 
-  void TestFinished() {
-    // We unwind the stack prior to finishing up to let stack
-    // based objects get deleted.
-    DCHECK(MessageLoop::current() == io_thread_->message_loop());
-    MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(&BlobURLRequestJobTest::TestFinishedUnwound,
-                   base::Unretained(this)));
-  }
-
-  void TestFinishedUnwound() {
-    TearDownTest();
-    test_finished_event_->Signal();
-  }
-
-  void PushNextTask(const base::Closure& task) {
-    task_stack_.push(std::pair<base::Closure, bool>(task, false));
-  }
-
-  void PushNextTaskAsImmediate(const base::Closure& task) {
-    task_stack_.push(std::pair<base::Closure, bool>(task, true));
-  }
-
-  void ScheduleNextTask() {
-    DCHECK(MessageLoop::current() == io_thread_->message_loop());
-    if (task_stack_.empty()) {
-      TestFinished();
-      return;
-    }
-
-    base::Closure task = task_stack_.top().first;
-    bool immediate = task_stack_.top().second;
-    task_stack_.pop();
-    if (immediate)
-      task.Run();
-    else
-      MessageLoop::current()->PostTask(FROM_HERE, task);
+  void OnValidateFileSystem(base::PlatformFileError result,
+                            const std::string& name,
+                            const GURL& root) {
+    ASSERT_EQ(base::PLATFORM_FILE_OK, result);
+    ASSERT_TRUE(root.is_valid());
+    file_system_root_url_ = root;
   }
 
   void TestSuccessRequest(BlobData* blob_data,
                           const std::string& expected_response) {
-    PushNextTask(base::Bind(&BlobURLRequestJobTest::VerifyResponse,
-                            base::Unretained(this)));
     expected_status_code_ = 200;
     expected_response_ = expected_response;
-    return TestRequest("GET", net::HttpRequestHeaders(), blob_data);
+    TestRequest("GET", net::HttpRequestHeaders(), blob_data);
   }
 
   void TestErrorRequest(BlobData* blob_data,
                         int expected_status_code) {
-    PushNextTask(base::Bind(&BlobURLRequestJobTest::VerifyResponse,
-                            base::Unretained(this)));
     expected_status_code_ = expected_status_code;
     expected_response_ = "";
-    return TestRequest("GET", net::HttpRequestHeaders(), blob_data);
+    TestRequest("GET", net::HttpRequestHeaders(), blob_data);
   }
 
   void TestRequest(const std::string& method,
                    const net::HttpRequestHeaders& extra_headers,
                    BlobData* blob_data) {
-    // This test has async steps.
+    base::RunLoop run_loop;
+    MockURLRequestDelegate url_request_delegate(&run_loop);
+
     request_.reset(empty_context_.CreateRequest(
-        GURL("blob:blah"), url_request_delegate_.get()));
+        GURL("blob:blah"), &url_request_delegate));
     request_->set_method(method);
     blob_url_request_job_ = new BlobURLRequestJob(
         request_.get(),
         empty_context_.network_delegate(),
         blob_data,
+        file_system_context_,
         base::MessageLoopProxy::current());
 
     // Start the request.
@@ -257,16 +321,14 @@ class BlobURLRequestJobTest : public testing::Test {
       request_->SetExtraRequestHeaders(extra_headers);
     request_->Start();
 
-    // Completion is async.
-  }
+    run_loop.Run();
 
-  void VerifyResponse() {
+    // Verify response.
     EXPECT_TRUE(request_->status().is_success());
     EXPECT_EQ(expected_status_code_,
               request_->response_headers()->response_code());
     EXPECT_STREQ(expected_response_.c_str(),
-                 url_request_delegate_->response_data().c_str());
-    TestFinished();
+                 url_request_delegate.response_data().c_str());
   }
 
   // Test Cases ---------------------------------------------------------------
@@ -320,16 +382,74 @@ class BlobURLRequestJobTest : public testing::Test {
     TestSuccessRequest(blob_data, result);
   }
 
+  void TestGetSimpleFileSystemFileRequest() {
+    SetUpFileSystem();
+    scoped_refptr<BlobData> blob_data(new BlobData());
+    blob_data->AppendFileSystemFile(temp_file_system_file1_, 0, -1,
+                                    base::Time());
+    TestSuccessRequest(blob_data, kTestFileSystemFileData1);
+  }
+
+  void TestGetLargeFileSystemFileRequest() {
+    SetUpFileSystem();
+    std::string large_data;
+    large_data.reserve(kBufferSize * 5);
+    for (int i = 0; i < kBufferSize * 5; ++i)
+      large_data.append(1, static_cast<char>(i % 256));
+
+    const char kFilename[] = "LargeBlob.dat";
+    WriteFileSystemFile(kFilename, large_data.data(), large_data.size(), NULL);
+
+    scoped_refptr<BlobData> blob_data(new BlobData());
+    blob_data->AppendFileSystemFile(GetFileSystemURL(kFilename),
+                                    0, -1, base::Time());
+    TestSuccessRequest(blob_data, large_data);
+  }
+
+  void TestGetNonExistentFileSystemFileRequest() {
+    SetUpFileSystem();
+    GURL non_existent_file = GetFileSystemURL("non-existent.dat");
+    scoped_refptr<BlobData> blob_data(new BlobData());
+    blob_data->AppendFileSystemFile(non_existent_file, 0, -1, base::Time());
+    TestErrorRequest(blob_data, 404);
+  }
+
+  void TestGetChangedFileSystemFileRequest() {
+    SetUpFileSystem();
+    scoped_refptr<BlobData> blob_data(new BlobData());
+    base::Time old_time =
+        temp_file_system_file_modification_time1_ -
+        base::TimeDelta::FromSeconds(10);
+    blob_data->AppendFileSystemFile(temp_file_system_file1_, 0, 3, old_time);
+    TestErrorRequest(blob_data, 404);
+  }
+
+  void TestGetSlicedFileSystemFileRequest() {
+    SetUpFileSystem();
+    scoped_refptr<BlobData> blob_data(new BlobData());
+    blob_data->AppendFileSystemFile(temp_file_system_file1_, 2, 4,
+                                    temp_file_system_file_modification_time1_);
+    std::string result(kTestFileSystemFileData1 + 2, 4);
+    TestSuccessRequest(blob_data, result);
+  }
+
   scoped_refptr<BlobData> BuildComplicatedData(std::string* expected_result) {
+    SetUpFileSystem();
     scoped_refptr<BlobData> blob_data(new BlobData());
     blob_data->AppendData(kTestData1 + 1, 2);
     blob_data->AppendFile(temp_file1_, 2, 3, temp_file_modification_time1_);
-    blob_data->AppendData(kTestData2 + 3, 4);
-    blob_data->AppendFile(temp_file2_, 4, 5, temp_file_modification_time2_);
+    blob_data->AppendFileSystemFile(temp_file_system_file1_, 3, 4,
+                                    temp_file_system_file_modification_time1_);
+    blob_data->AppendData(kTestData2 + 4, 5);
+    blob_data->AppendFile(temp_file2_, 5, 6, temp_file_modification_time2_);
+    blob_data->AppendFileSystemFile(temp_file_system_file2_, 6, 7,
+                                    temp_file_system_file_modification_time2_);
     *expected_result = std::string(kTestData1 + 1, 2);
     *expected_result += std::string(kTestFileData1 + 2, 3);
-    *expected_result += std::string(kTestData2 + 3, 4);
-    *expected_result += std::string(kTestFileData2 + 4, 5);
+    *expected_result += std::string(kTestFileSystemFileData1 + 3, 4);
+    *expected_result += std::string(kTestData2 + 4, 5);
+    *expected_result += std::string(kTestFileData2 + 5, 6);
+    *expected_result += std::string(kTestFileSystemFileData2 + 6, 7);
     return blob_data;
   }
 
@@ -344,11 +464,9 @@ class BlobURLRequestJobTest : public testing::Test {
     scoped_refptr<BlobData> blob_data = BuildComplicatedData(&result);
     net::HttpRequestHeaders extra_headers;
     extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=5-10");
-    PushNextTask(base::Bind(&BlobURLRequestJobTest::VerifyResponse,
-                            base::Unretained(this)));
     expected_status_code_ = 206;
     expected_response_ = result.substr(5, 10 - 5 + 1);
-    return TestRequest("GET", extra_headers, blob_data);
+    TestRequest("GET", extra_headers, blob_data);
   }
 
   void TestGetRangeRequest2() {
@@ -356,11 +474,9 @@ class BlobURLRequestJobTest : public testing::Test {
     scoped_refptr<BlobData> blob_data = BuildComplicatedData(&result);
     net::HttpRequestHeaders extra_headers;
     extra_headers.SetHeader(net::HttpRequestHeaders::kRange, "bytes=-10");
-    PushNextTask(base::Bind(&BlobURLRequestJobTest::VerifyResponse,
-                            base::Unretained(this)));
     expected_status_code_ = 206;
     expected_response_ = result.substr(result.length() - 10);
-    return TestRequest("GET", extra_headers, blob_data);
+    TestRequest("GET", extra_headers, blob_data);
   }
 
   void TestExtraHeaders() {
@@ -368,16 +484,10 @@ class BlobURLRequestJobTest : public testing::Test {
     blob_data->set_content_type(kTestContentType);
     blob_data->set_content_disposition(kTestContentDisposition);
     blob_data->AppendData(kTestData1);
-    PushNextTask(
-        base::Bind(&BlobURLRequestJobTest::VerifyResponseForTestExtraHeaders,
-                   base::Unretained(this)));
+    expected_status_code_ = 200;
+    expected_response_ = kTestData1;
     TestRequest("GET", net::HttpRequestHeaders(), blob_data);
-  }
 
-  void VerifyResponseForTestExtraHeaders() {
-    EXPECT_TRUE(request_->status().is_success());
-    EXPECT_EQ(request_->response_headers()->response_code(), 200);
-    EXPECT_STREQ(url_request_delegate_->response_data().c_str(), kTestData1);
     std::string content_type;
     EXPECT_TRUE(request_->response_headers()->GetMimeType(&content_type));
     EXPECT_STREQ(content_type.c_str(), kTestContentType);
@@ -386,7 +496,6 @@ class BlobURLRequestJobTest : public testing::Test {
     EXPECT_TRUE(request_->response_headers()->EnumerateHeader(
         &iter, "Content-Disposition", &content_disposition));
     EXPECT_STREQ(content_disposition.c_str(), kTestContentDisposition);
-    TestFinished();
   }
 
  private:
@@ -395,14 +504,18 @@ class BlobURLRequestJobTest : public testing::Test {
   FilePath temp_file2_;
   base::Time temp_file_modification_time1_;
   base::Time temp_file_modification_time2_;
+  GURL file_system_root_url_;
+  GURL temp_file_system_file1_;
+  GURL temp_file_system_file2_;
+  base::Time temp_file_system_file_modification_time1_;
+  base::Time temp_file_system_file_modification_time2_;
   scoped_ptr<base::Thread> io_thread_;
   static BlobURLRequestJob* blob_url_request_job_;
 
   scoped_ptr<base::WaitableEvent> test_finished_event_;
-  std::stack<std::pair<base::Closure, bool> > task_stack_;
   net::URLRequestContext empty_context_;
   scoped_ptr<net::URLRequest> request_;
-  scoped_ptr<MockURLRequestDelegate> url_request_delegate_;
+  scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   int expected_status_code_;
   std::string expected_response_;
 };
@@ -434,6 +547,28 @@ TEST_F(BlobURLRequestJobTest, TestGetChangedFileRequest) {
   RunTestOnIOThread(&BlobURLRequestJobTest::TestGetChangedFileRequest);
 }
 
+TEST_F(BlobURLRequestJobTest, TestGetSimpleFileSystemFileRequest) {
+  RunTestOnIOThread(&BlobURLRequestJobTest::TestGetSimpleFileSystemFileRequest);
+}
+
+TEST_F(BlobURLRequestJobTest, TestGetLargeFileSystemFileRequest) {
+  RunTestOnIOThread(&BlobURLRequestJobTest::TestGetLargeFileSystemFileRequest);
+}
+
+TEST_F(BlobURLRequestJobTest, TestGetSlicedFileSystemFileRequest) {
+  RunTestOnIOThread(&BlobURLRequestJobTest::TestGetSlicedFileSystemFileRequest);
+}
+
+TEST_F(BlobURLRequestJobTest, TestGetNonExistentFileSystemFileRequest) {
+  RunTestOnIOThread(
+      &BlobURLRequestJobTest::TestGetNonExistentFileSystemFileRequest);
+}
+
+TEST_F(BlobURLRequestJobTest, TestGetChangedFileSystemFileRequest) {
+  RunTestOnIOThread(
+      &BlobURLRequestJobTest::TestGetChangedFileSystemFileRequest);
+}
+
 TEST_F(BlobURLRequestJobTest, TestGetComplicatedDataAndFileRequest) {
   RunTestOnIOThread(
       &BlobURLRequestJobTest::TestGetComplicatedDataAndFileRequest);