OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/fileapi/file_system_url_request_job.h" | 5 #include "webkit/fileapi/file_system_url_request_job.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/format_macros.h" | 12 #include "base/format_macros.h" |
13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
15 #include "base/message_loop_proxy.h" | 15 #include "base/message_loop_proxy.h" |
16 #include "base/platform_file.h" | 16 #include "base/platform_file.h" |
17 #include "base/scoped_temp_dir.h" | 17 #include "base/scoped_temp_dir.h" |
18 #include "base/string_piece.h" | 18 #include "base/string_piece.h" |
19 #include "base/stringprintf.h" | 19 #include "base/stringprintf.h" |
20 #include "base/utf_string_conversions.h" | 20 #include "base/utf_string_conversions.h" |
21 #include "net/base/load_flags.h" | 21 #include "net/base/load_flags.h" |
22 #include "net/base/mime_util.h" | 22 #include "net/base/mime_util.h" |
23 #include "net/base/net_errors.h" | 23 #include "net/base/net_errors.h" |
24 #include "net/base/net_util.h" | 24 #include "net/base/net_util.h" |
25 #include "net/http/http_request_headers.h" | 25 #include "net/http/http_request_headers.h" |
26 #include "net/url_request/url_request.h" | 26 #include "net/url_request/url_request.h" |
| 27 #include "net/url_request/url_request_context.h" |
27 #include "net/url_request/url_request_test_util.h" | 28 #include "net/url_request/url_request_test_util.h" |
28 #include "testing/gtest/include/gtest/gtest.h" | 29 #include "testing/gtest/include/gtest/gtest.h" |
29 #include "webkit/fileapi/file_system_context.h" | 30 #include "webkit/fileapi/file_system_context.h" |
30 #include "webkit/fileapi/file_system_file_util.h" | 31 #include "webkit/fileapi/file_system_file_util.h" |
31 #include "webkit/fileapi/file_system_operation_context.h" | 32 #include "webkit/fileapi/file_system_operation_context.h" |
32 #include "webkit/fileapi/file_system_task_runners.h" | 33 #include "webkit/fileapi/file_system_task_runners.h" |
33 #include "webkit/fileapi/mock_file_system_options.h" | 34 #include "webkit/fileapi/mock_file_system_options.h" |
34 #include "webkit/fileapi/sandbox_mount_point_provider.h" | 35 #include "webkit/fileapi/sandbox_mount_point_provider.h" |
35 #include "webkit/quota/mock_special_storage_policy.h" | 36 #include "webkit/quota/mock_special_storage_policy.h" |
36 | 37 |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 // Make delegate_ exit the MessageLoop when the request is done. | 111 // Make delegate_ exit the MessageLoop when the request is done. |
111 delegate_->set_quit_on_complete(true); | 112 delegate_->set_quit_on_complete(true); |
112 delegate_->set_quit_on_redirect(true); | 113 delegate_->set_quit_on_redirect(true); |
113 request_.reset( | 114 request_.reset( |
114 new net::URLRequest(url, delegate_.get(), &empty_context_)); | 115 new net::URLRequest(url, delegate_.get(), &empty_context_)); |
115 if (headers) | 116 if (headers) |
116 request_->SetExtraRequestHeaders(*headers); | 117 request_->SetExtraRequestHeaders(*headers); |
117 ASSERT_TRUE(!job_); | 118 ASSERT_TRUE(!job_); |
118 job_ = new FileSystemURLRequestJob( | 119 job_ = new FileSystemURLRequestJob( |
119 request_.get(), | 120 request_.get(), |
| 121 request_->context()->network_delegate(), |
120 file_system_context_.get()); | 122 file_system_context_.get()); |
121 pending_job_ = job_; | 123 pending_job_ = job_; |
122 | 124 |
123 request_->Start(); | 125 request_->Start(); |
124 ASSERT_TRUE(request_->is_pending()); // verify that we're starting async | 126 ASSERT_TRUE(request_->is_pending()); // verify that we're starting async |
125 if (run_to_completion) | 127 if (run_to_completion) |
126 MessageLoop::current()->Run(); | 128 MessageLoop::current()->Run(); |
127 } | 129 } |
128 | 130 |
129 void TestRequest(const GURL& url) { | 131 void TestRequest(const GURL& url) { |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 | 368 |
367 TestRequest(CreateFileSystemURL(kFilename)); | 369 TestRequest(CreateFileSystemURL(kFilename)); |
368 | 370 |
369 std::string mime_type_from_job; | 371 std::string mime_type_from_job; |
370 request_->GetMimeType(&mime_type_from_job); | 372 request_->GetMimeType(&mime_type_from_job); |
371 EXPECT_EQ(mime_type_direct, mime_type_from_job); | 373 EXPECT_EQ(mime_type_direct, mime_type_from_job); |
372 } | 374 } |
373 | 375 |
374 } // namespace | 376 } // namespace |
375 } // namespace fileapi | 377 } // namespace fileapi |
OLD | NEW |