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

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

Issue 8311002: Revert 105669 - Additional infrastructure code supporting the report fraudulent certificate chain... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_impl_io_data.h" 5 #include "chrome/browser/profiles/profile_impl_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/file_util.h" 9 #include "base/file_util.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 main_context->set_dnsrr_resolver( 284 main_context->set_dnsrr_resolver(
285 io_thread_globals->dnsrr_resolver.get()); 285 io_thread_globals->dnsrr_resolver.get());
286 media_request_context_->set_dnsrr_resolver( 286 media_request_context_->set_dnsrr_resolver(
287 io_thread_globals->dnsrr_resolver.get()); 287 io_thread_globals->dnsrr_resolver.get());
288 main_context->set_http_auth_handler_factory( 288 main_context->set_http_auth_handler_factory(
289 io_thread_globals->http_auth_handler_factory.get()); 289 io_thread_globals->http_auth_handler_factory.get());
290 media_request_context_->set_http_auth_handler_factory( 290 media_request_context_->set_http_auth_handler_factory(
291 io_thread_globals->http_auth_handler_factory.get()); 291 io_thread_globals->http_auth_handler_factory.get());
292 292
293 main_context->set_dns_cert_checker(dns_cert_checker()); 293 main_context->set_dns_cert_checker(dns_cert_checker());
294 main_context->set_fraudulent_certificate_reporter(
295 fraudulent_certificate_reporter());
296 media_request_context_->set_dns_cert_checker(dns_cert_checker()); 294 media_request_context_->set_dns_cert_checker(dns_cert_checker());
297 media_request_context_->set_fraudulent_certificate_reporter(
298 fraudulent_certificate_reporter());
299 295
300 main_context->set_proxy_service(proxy_service()); 296 main_context->set_proxy_service(proxy_service());
301 media_request_context_->set_proxy_service(proxy_service()); 297 media_request_context_->set_proxy_service(proxy_service());
302 298
303 scoped_refptr<net::CookieStore> cookie_store = NULL; 299 scoped_refptr<net::CookieStore> cookie_store = NULL;
304 net::OriginBoundCertService* origin_bound_cert_service = NULL; 300 net::OriginBoundCertService* origin_bound_cert_service = NULL;
305 if (record_mode || playback_mode) { 301 if (record_mode || playback_mode) {
306 // Don't use existing cookies and use an in-memory store. 302 // Don't use existing cookies and use an in-memory store.
307 cookie_store = new net::CookieMonster( 303 cookie_store = new net::CookieMonster(
308 NULL, profile_params->cookie_monster_delegate); 304 NULL, profile_params->cookie_monster_delegate);
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 scoped_refptr<ChromeURLRequestContext> 480 scoped_refptr<ChromeURLRequestContext>
485 ProfileImplIOData::AcquireIsolatedAppRequestContext( 481 ProfileImplIOData::AcquireIsolatedAppRequestContext(
486 scoped_refptr<ChromeURLRequestContext> main_context, 482 scoped_refptr<ChromeURLRequestContext> main_context,
487 const std::string& app_id) const { 483 const std::string& app_id) const {
488 // We create per-app contexts on demand, unlike the others above. 484 // We create per-app contexts on demand, unlike the others above.
489 scoped_refptr<ChromeURLRequestContext> app_request_context = 485 scoped_refptr<ChromeURLRequestContext> app_request_context =
490 InitializeAppRequestContext(main_context, app_id); 486 InitializeAppRequestContext(main_context, app_id);
491 DCHECK(app_request_context); 487 DCHECK(app_request_context);
492 return app_request_context; 488 return app_request_context;
493 } 489 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_io_data.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698