Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: webkit/fileapi/file_system_url_request_job_unittest.cc

Issue 10855209: Refactoring: ProtocolHandler::MaybeCreateJob takes NetworkDelegate as argument (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Latest merge Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 empty_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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 base::WritePlatformFile(handle, 0 /* offset */, buf, buf_size)); 183 base::WritePlatformFile(handle, 0 /* offset */, buf, buf_size));
182 base::ClosePlatformFile(handle); 184 base::ClosePlatformFile(handle);
183 } 185 }
184 186
185 GURL CreateFileSystemURL(const std::string& path) { 187 GURL CreateFileSystemURL(const std::string& path) {
186 return GURL(kFileSystemURLPrefix + path); 188 return GURL(kFileSystemURLPrefix + path);
187 } 189 }
188 190
189 static net::URLRequestJob* FileSystemURLRequestJobFactory( 191 static net::URLRequestJob* FileSystemURLRequestJobFactory(
190 net::URLRequest* request, 192 net::URLRequest* request,
193 net::NetworkDelegate* network_delegate,
191 const std::string& scheme) { 194 const std::string& scheme) {
192 DCHECK(job_); 195 DCHECK(job_);
193 net::URLRequestJob* temp = job_; 196 net::URLRequestJob* temp = job_;
194 job_ = NULL; 197 job_ = NULL;
195 return temp; 198 return temp;
196 } 199 }
197 200
198 static void ClearUnusedJob() { 201 static void ClearUnusedJob() {
199 if (job_) { 202 if (job_) {
200 scoped_refptr<net::URLRequestJob> deleter = job_; 203 scoped_refptr<net::URLRequestJob> deleter = job_;
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 369
367 TestRequest(CreateFileSystemURL(kFilename)); 370 TestRequest(CreateFileSystemURL(kFilename));
368 371
369 std::string mime_type_from_job; 372 std::string mime_type_from_job;
370 request_->GetMimeType(&mime_type_from_job); 373 request_->GetMimeType(&mime_type_from_job);
371 EXPECT_EQ(mime_type_direct, mime_type_from_job); 374 EXPECT_EQ(mime_type_direct, mime_type_from_job);
372 } 375 }
373 376
374 } // namespace 377 } // namespace
375 } // namespace fileapi 378 } // namespace fileapi
OLDNEW
« no previous file with comments | « webkit/fileapi/file_system_url_request_job_factory.cc ('k') | webkit/fileapi/file_writer_delegate_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698