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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 787803004: Update from https://crrev.com/307664 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase. Created 6 years 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
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/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
15 #include "net/base/cache_type.h" 15 #include "net/base/cache_type.h"
16 #include "net/base/net_errors.h" 16 #include "net/base/net_errors.h"
17 #include "net/base/network_delegate.h" 17 #include "net/base/network_delegate_impl.h"
18 #include "net/cert/cert_verifier.h" 18 #include "net/cert/cert_verifier.h"
19 #include "net/cookies/cookie_monster.h" 19 #include "net/cookies/cookie_monster.h"
20 #include "net/dns/host_resolver.h" 20 #include "net/dns/host_resolver.h"
21 #include "net/ftp/ftp_network_layer.h" 21 #include "net/ftp/ftp_network_layer.h"
22 #include "net/http/http_auth_handler_factory.h" 22 #include "net/http/http_auth_handler_factory.h"
23 #include "net/http/http_cache.h" 23 #include "net/http/http_cache.h"
24 #include "net/http/http_network_layer.h" 24 #include "net/http/http_network_layer.h"
25 #include "net/http/http_network_session.h" 25 #include "net/http/http_network_session.h"
26 #include "net/http/http_server_properties_impl.h" 26 #include "net/http/http_server_properties_impl.h"
27 #include "net/http/transport_security_persister.h" 27 #include "net/http/transport_security_persister.h"
(...skipping 13 matching lines...) Expand all
41 #endif 41 #endif
42 42
43 #if !defined(DISABLE_FTP_SUPPORT) 43 #if !defined(DISABLE_FTP_SUPPORT)
44 #include "net/url_request/ftp_protocol_handler.h" 44 #include "net/url_request/ftp_protocol_handler.h"
45 #endif 45 #endif
46 46
47 namespace net { 47 namespace net {
48 48
49 namespace { 49 namespace {
50 50
51 class BasicNetworkDelegate : public NetworkDelegate { 51 class BasicNetworkDelegate : public NetworkDelegateImpl {
52 public: 52 public:
53 BasicNetworkDelegate() {} 53 BasicNetworkDelegate() {}
54 ~BasicNetworkDelegate() override {} 54 ~BasicNetworkDelegate() override {}
55 55
56 private: 56 private:
57 int OnBeforeURLRequest(URLRequest* request, 57 int OnBeforeURLRequest(URLRequest* request,
58 const CompletionCallback& callback, 58 const CompletionCallback& callback,
59 GURL* new_url) override { 59 GURL* new_url) override {
60 return OK; 60 return OK;
61 } 61 }
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 #endif // !defined(DISABLE_FTP_SUPPORT) 401 #endif // !defined(DISABLE_FTP_SUPPORT)
402 402
403 storage->set_job_factory(job_factory); 403 storage->set_job_factory(job_factory);
404 404
405 // TODO(willchan): Support sdch. 405 // TODO(willchan): Support sdch.
406 406
407 return context; 407 return context;
408 } 408 }
409 409
410 } // namespace net 410 } // namespace net
OLDNEW
« no previous file with comments | « net/test/android/javatests/src/org/chromium/net/test/util/TestWebServer.java ('k') | net/url_request/url_request_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698