| Index: webkit/browser/fileapi/file_system_url_request_job_factory.cc
|
| diff --git a/webkit/browser/fileapi/file_system_url_request_job_factory.cc b/webkit/browser/fileapi/file_system_url_request_job_factory.cc
|
| index 76ae7c9ac0596b801cd778fd31010d4ffcd97dbd..5f217a1acc9c1aa0b455f600ca857a8bdbd19f81 100644
|
| --- a/webkit/browser/fileapi/file_system_url_request_job_factory.cc
|
| +++ b/webkit/browser/fileapi/file_system_url_request_job_factory.cc
|
| @@ -19,7 +19,8 @@ namespace {
|
| class FileSystemProtocolHandler
|
| : public net::URLRequestJobFactory::ProtocolHandler {
|
| public:
|
| - explicit FileSystemProtocolHandler(FileSystemContext* context);
|
| + FileSystemProtocolHandler(const std::string& partition_domain,
|
| + FileSystemContext* context);
|
| virtual ~FileSystemProtocolHandler();
|
|
|
| virtual net::URLRequestJob* MaybeCreateJob(
|
| @@ -27,6 +28,8 @@ class FileSystemProtocolHandler
|
| net::NetworkDelegate* network_delegate) const OVERRIDE;
|
|
|
| private:
|
| + const std::string partition_domain_;
|
| +
|
| // No scoped_refptr because |file_system_context_| is owned by the
|
| // ProfileIOData, which also owns this ProtocolHandler.
|
| FileSystemContext* const file_system_context_;
|
| @@ -35,8 +38,10 @@ class FileSystemProtocolHandler
|
| };
|
|
|
| FileSystemProtocolHandler::FileSystemProtocolHandler(
|
| + const std::string& partition_domain,
|
| FileSystemContext* context)
|
| - : file_system_context_(context) {
|
| + : partition_domain_(partition_domain),
|
| + file_system_context_(context) {
|
| DCHECK(file_system_context_);
|
| }
|
|
|
| @@ -51,18 +56,18 @@ net::URLRequestJob* FileSystemProtocolHandler::MaybeCreateJob(
|
| // redirects back here, by adding a / to the URL.
|
| if (!path.empty() && path[path.size() - 1] == '/') {
|
| return new FileSystemDirURLRequestJob(
|
| - request, network_delegate, file_system_context_);
|
| + request, network_delegate, partition_domain_, file_system_context_);
|
| }
|
| return new FileSystemURLRequestJob(
|
| - request, network_delegate, file_system_context_);
|
| + request, network_delegate, partition_domain_, file_system_context_);
|
| }
|
|
|
| } // anonymous namespace
|
|
|
| -net::URLRequestJobFactory::ProtocolHandler*
|
| -CreateFileSystemProtocolHandler(FileSystemContext* context) {
|
| +net::URLRequestJobFactory::ProtocolHandler* CreateFileSystemProtocolHandler(
|
| + const std::string& partition_domain, FileSystemContext* context) {
|
| DCHECK(context);
|
| - return new FileSystemProtocolHandler(context);
|
| + return new FileSystemProtocolHandler(partition_domain, context);
|
| }
|
|
|
| } // namespace fileapi
|
|
|