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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_io_data.cc

Issue 1267383002: Allow preloaded pins to contain report URIs; remove special-case reporting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase fixup Created 5 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
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 "chrome/browser/profiles/off_the_record_profile_io_data.h" 5 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 main_context->set_net_log(io_thread->net_log()); 212 main_context->set_net_log(io_thread->net_log());
213 213
214 main_context->set_network_delegate(chrome_network_delegate.get()); 214 main_context->set_network_delegate(chrome_network_delegate.get());
215 215
216 network_delegate_ = chrome_network_delegate.Pass(); 216 network_delegate_ = chrome_network_delegate.Pass();
217 217
218 main_context->set_host_resolver( 218 main_context->set_host_resolver(
219 io_thread_globals->host_resolver.get()); 219 io_thread_globals->host_resolver.get());
220 main_context->set_http_auth_handler_factory( 220 main_context->set_http_auth_handler_factory(
221 io_thread_globals->http_auth_handler_factory.get()); 221 io_thread_globals->http_auth_handler_factory.get());
222 main_context->set_fraudulent_certificate_reporter(
223 fraudulent_certificate_reporter());
224 main_context->set_proxy_service(proxy_service()); 222 main_context->set_proxy_service(proxy_service());
225 223
226 main_context->set_cert_transparency_verifier( 224 main_context->set_cert_transparency_verifier(
227 io_thread_globals->cert_transparency_verifier.get()); 225 io_thread_globals->cert_transparency_verifier.get());
228 main_context->set_backoff_manager( 226 main_context->set_backoff_manager(
229 io_thread_globals->url_request_backoff_manager.get()); 227 io_thread_globals->url_request_backoff_manager.get());
230 228
231 // For incognito, we use the default non-persistent HttpServerPropertiesImpl. 229 // For incognito, we use the default non-persistent HttpServerPropertiesImpl.
232 set_http_server_properties( 230 set_http_server_properties(
233 scoped_ptr<net::HttpServerProperties>( 231 scoped_ptr<net::HttpServerProperties>(
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 return app_request_context; 402 return app_request_context;
405 } 403 }
406 404
407 net::URLRequestContext* 405 net::URLRequestContext*
408 OffTheRecordProfileIOData::AcquireIsolatedMediaRequestContext( 406 OffTheRecordProfileIOData::AcquireIsolatedMediaRequestContext(
409 net::URLRequestContext* app_context, 407 net::URLRequestContext* app_context,
410 const StoragePartitionDescriptor& partition_descriptor) const { 408 const StoragePartitionDescriptor& partition_descriptor) const {
411 NOTREACHED(); 409 NOTREACHED();
412 return NULL; 410 return NULL;
413 } 411 }
OLDNEW
« no previous file with comments | « chrome/browser/net/certificate_error_reporter_unittest.cc ('k') | chrome/browser/profiles/profile_impl_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698