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

Side by Side Diff: trunk/src/net/proxy/proxy_script_fetcher_impl_unittest.cc

Issue 12605011: Revert 188912 "Removed static factories for data, ftp, file, and..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 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 "net/proxy/proxy_script_fetcher_impl.h" 5 #include "net/proxy/proxy_script_fetcher_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "net/base/load_flags.h" 13 #include "net/base/load_flags.h"
14 #include "net/base/mock_cert_verifier.h" 14 #include "net/base/mock_cert_verifier.h"
15 #include "net/base/mock_host_resolver.h" 15 #include "net/base/mock_host_resolver.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 #include "net/base/test_completion_callback.h" 17 #include "net/base/test_completion_callback.h"
18 #include "net/disk_cache/disk_cache.h" 18 #include "net/disk_cache/disk_cache.h"
19 #include "net/http/http_cache.h" 19 #include "net/http/http_cache.h"
20 #include "net/http/http_network_session.h" 20 #include "net/http/http_network_session.h"
21 #include "net/http/http_server_properties_impl.h" 21 #include "net/http/http_server_properties_impl.h"
22 #include "net/ssl/ssl_config_service_defaults.h" 22 #include "net/ssl/ssl_config_service_defaults.h"
23 #include "net/test/test_server.h" 23 #include "net/test/test_server.h"
24 #include "net/url_request/file_protocol_handler.h"
25 #include "net/url_request/url_request_context_storage.h" 24 #include "net/url_request/url_request_context_storage.h"
26 #include "net/url_request/url_request_file_job.h" 25 #include "net/url_request/url_request_file_job.h"
27 #include "net/url_request/url_request_job_factory_impl.h" 26 #include "net/url_request/url_request_job_factory_impl.h"
28 #include "net/url_request/url_request_test_util.h" 27 #include "net/url_request/url_request_test_util.h"
29 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
30 #include "testing/platform_test.h" 29 #include "testing/platform_test.h"
31 30
32 namespace net { 31 namespace net {
33 32
34 // TODO(eroman): 33 // TODO(eroman):
(...skipping 25 matching lines...) Expand all
60 params.host_resolver = host_resolver(); 59 params.host_resolver = host_resolver();
61 params.cert_verifier = cert_verifier(); 60 params.cert_verifier = cert_verifier();
62 params.proxy_service = proxy_service(); 61 params.proxy_service = proxy_service();
63 params.ssl_config_service = ssl_config_service(); 62 params.ssl_config_service = ssl_config_service();
64 params.http_server_properties = http_server_properties(); 63 params.http_server_properties = http_server_properties();
65 scoped_refptr<HttpNetworkSession> network_session( 64 scoped_refptr<HttpNetworkSession> network_session(
66 new HttpNetworkSession(params)); 65 new HttpNetworkSession(params));
67 storage_.set_http_transaction_factory(new HttpCache( 66 storage_.set_http_transaction_factory(new HttpCache(
68 network_session, 67 network_session,
69 HttpCache::DefaultBackend::InMemory(0))); 68 HttpCache::DefaultBackend::InMemory(0)));
70 URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl(); 69 storage_.set_job_factory(new URLRequestJobFactoryImpl());
71 job_factory->SetProtocolHandler("file", new FileProtocolHandler());
72 storage_.set_job_factory(job_factory);
73 } 70 }
74 71
75 virtual ~RequestContext() { 72 virtual ~RequestContext() {
76 } 73 }
77 74
78 private: 75 private:
79 URLRequestContextStorage storage_; 76 URLRequestContextStorage storage_;
80 }; 77 };
81 78
82 // Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest. 79 // Get a file:// url relative to net/data/proxy/proxy_script_fetcher_unittest.
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 { 473 {
477 GURL url(kEncodedUrlBroken); 474 GURL url(kEncodedUrlBroken);
478 string16 text; 475 string16 text;
479 TestCompletionCallback callback; 476 TestCompletionCallback callback;
480 int result = pac_fetcher.Fetch(url, &text, callback.callback()); 477 int result = pac_fetcher.Fetch(url, &text, callback.callback());
481 EXPECT_EQ(ERR_FAILED, result); 478 EXPECT_EQ(ERR_FAILED, result);
482 } 479 }
483 } 480 }
484 481
485 } // namespace net 482 } // namespace net
OLDNEW
« no previous file with comments | « trunk/src/net/ftp/ftp_network_session.h ('k') | trunk/src/net/url_request/file_protocol_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698