Revert of Add mechanism to auto mount file systems in response to a URL request.

content/browser/fileapi/file_system_url_request_job_unittest.cc

 // Copyright 2013 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 "webkit/browser/fileapi/file_system_url_request_job.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/test/async_file_test_helper.h"
-#include "content/public/test/test_file_system_backend.h"
 #include "content/public/test/test_file_system_context.h"
 #include "net/base/load_flags.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_request_headers.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 12 matching lines @@
 namespace {
 
 // We always use the TEMPORARY FileSystem in this test.
 const char kFileSystemURLPrefix[] = "filesystem:http://remote/temporary/";
 const char kTestFileData[] = "0123456789";
 
 void FillBuffer(char* buffer, size_t len) {
   base::RandBytes(buffer, len);
 }
 
-const char kValidExternalMountPoint[] = "mnt_name";
-
-// An auto mounter that will try to mount anything for |storage_domain| =
-// "automount", but will only succeed for the mount point "mnt_name".
-bool TestAutoMountForURLRequest(
-    const net::URLRequest* /*url_request*/,
-    const fileapi::FileSystemURL& filesystem_url,
-    const std::string& storage_domain,
-    const base::Callback<void(base::File::Error result)>& callback) {
-  if (storage_domain != "automount")
-    return false;
-  std::vector<base::FilePath::StringType> components;
-  filesystem_url.path().GetComponents(&components);
-  std::string mount_point = base::FilePath(components[0]).AsUTF8Unsafe();
-
-  if (mount_point == kValidExternalMountPoint) {
-    fileapi::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-        kValidExternalMountPoint, fileapi::kFileSystemTypeTest,
-        fileapi::FileSystemMountOption(), base::FilePath());
-    callback.Run(base::File::FILE_OK);
-  } else {
-    callback.Run(base::File::FILE_ERROR_NOT_FOUND);
-  }
-  return true;
-}
-
 }  // namespace
 
 class FileSystemURLRequestJobTest : public testing::Test {
  protected:
   FileSystemURLRequestJobTest() : weak_factory_(this) {
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
@@ skipping 17 matching lines @@
     net::URLRequest::Deprecated::RegisterProtocolFactory("filesystem", NULL);
     ClearUnusedJob();
     if (pending_job_.get()) {
       pending_job_->Kill();
       pending_job_ = NULL;
     }
     // FileReader posts a task to close the file in destructor.
     base::RunLoop().RunUntilIdle();
   }
 
-  void SetUpAutoMountContext() {
-    base::FilePath mnt_point = temp_dir_.path().AppendASCII("auto_mount_dir");
-    ASSERT_TRUE(base::CreateDirectory(mnt_point));
-
-    ScopedVector<fileapi::FileSystemBackend> additional_providers;
-    additional_providers.push_back(new TestFileSystemBackend(
-        base::MessageLoopProxy::current().get(), mnt_point));
-
-    std::vector<fileapi::URLRequestAutoMountHandler> handlers;
-    handlers.push_back(base::Bind(&TestAutoMountForURLRequest));
-
-    file_system_context_ = CreateFileSystemContextWithAutoMountersForTesting(
-        NULL, additional_providers.Pass(), handlers, temp_dir_.path());
-
-    ASSERT_EQ(static_cast<int>(sizeof(kTestFileData)) - 1,
-              base::WriteFile(mnt_point.AppendASCII("foo"), kTestFileData,
-                              sizeof(kTestFileData) - 1));
-  }
-
   void OnOpenFileSystem(const GURL& root_url,
                         const std::string& name,
                         base::File::Error result) {
     ASSERT_EQ(base::File::FILE_OK, result);
   }
 
   void TestRequestHelper(const GURL& url,
                          const net::HttpRequestHeaders* headers,
                          bool run_to_completion,
                          FileSystemContext* file_system_context) {
     delegate_.reset(new net::TestDelegate());
     // Make delegate_ exit the MessageLoop when the request is done.
     delegate_->set_quit_on_complete(true);
     delegate_->set_quit_on_redirect(true);
     request_ = empty_context_.CreateRequest(
         url, net::DEFAULT_PRIORITY, delegate_.get(), NULL);
     if (headers)
       request_->SetExtraRequestHeaders(*headers);
     ASSERT_TRUE(!job_);
     job_ = new FileSystemURLRequestJob(
-        request_.get(), NULL, url.GetOrigin().host(), file_system_context);
+        request_.get(), NULL, file_system_context);
     pending_job_ = job_;
 
     request_->Start();
     ASSERT_TRUE(request_->is_pending());  // verify that we're starting async
     if (run_to_completion)
       base::MessageLoop::current()->Run();
   }
 
   void TestRequest(const GURL& url) {
     TestRequestHelper(url, NULL, true, file_system_context_.get());
@@ skipping 129 matching lines @@
       net::HttpRequestHeaders::kRange,
       net::HttpByteRange::RightUnbounded(first_byte_position).GetHeaderValue());
   TestRequestWithHeaders(CreateFileSystemURL("bigfile"), &headers);
   ASSERT_FALSE(request_->is_pending());
   EXPECT_EQ(1, delegate_->response_started_count());
   EXPECT_FALSE(delegate_->received_data_before_response());
   // Don't use EXPECT_EQ, it will print out a lot of garbage if check failed.
   EXPECT_TRUE(partial_buffer_string == delegate_->data_received());
 }
 
+
 TEST_F(FileSystemURLRequestJobTest, FileTestMultipleRangesNotSupported) {
   WriteFile("file1.dat", kTestFileData, arraysize(kTestFileData) - 1);
   net::HttpRequestHeaders headers;
   headers.SetHeader(net::HttpRequestHeaders::kRange,
                     "bytes=0-5,10-200,200-300");
   TestRequestWithHeaders(CreateFileSystemURL("file1.dat"), &headers);
   EXPECT_TRUE(delegate_->request_failed());
   EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE,
             request_->status().error());
 }
@@ skipping 88 matching lines @@
   EXPECT_TRUE(delegate_->request_failed());
   EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
 
   // Make sure it returns success with regular (non-incognito) context.
   TestRequest(CreateFileSystemURL("file"));
   ASSERT_FALSE(request_->is_pending());
   EXPECT_EQ(kTestFileData, delegate_->data_received());
   EXPECT_EQ(200, request_->GetResponseCode());
 }
 
-TEST_F(FileSystemURLRequestJobTest, AutoMountFileTest) {
-  SetUpAutoMountContext();
-  TestRequest(GURL("filesystem:http://automount/external/mnt_name/foo"));
-
-  ASSERT_FALSE(request_->is_pending());
-  EXPECT_EQ(1, delegate_->response_started_count());
-  EXPECT_FALSE(delegate_->received_data_before_response());
-  EXPECT_EQ(kTestFileData, delegate_->data_received());
-  EXPECT_EQ(200, request_->GetResponseCode());
-  std::string cache_control;
-  request_->GetResponseHeaderByName("cache-control", &cache_control);
-  EXPECT_EQ("no-cache", cache_control);
-
-  ASSERT_TRUE(
-      fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
-          kValidExternalMountPoint));
-}
-
-TEST_F(FileSystemURLRequestJobTest, AutoMountInvalidRoot) {
-  SetUpAutoMountContext();
-  TestRequest(GURL("filesystem:http://automount/external/invalid/foo"));
-
-  ASSERT_FALSE(request_->is_pending());
-  EXPECT_TRUE(delegate_->request_failed());
-  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
-
-  ASSERT_FALSE(
-      fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
-          "invalid"));
-}
-
-TEST_F(FileSystemURLRequestJobTest, AutoMountNoHandler) {
-  SetUpAutoMountContext();
-  TestRequest(GURL("filesystem:http://noauto/external/mnt_name/foo"));
-
-  ASSERT_FALSE(request_->is_pending());
-  EXPECT_TRUE(delegate_->request_failed());
-  EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request_->status().error());
-
-  ASSERT_FALSE(
-      fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
-          kValidExternalMountPoint));
-}
-
 }  // namespace
 }  // namespace content