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

Side by Side Diff: ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc

Issue 2079283002: [iOS/GN] Allow compilation with system clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename use_system_clang to is_clang_xcode Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h" 5 #include "ios/chrome/browser/browser_state/chrome_browser_state_io_data.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 certificate_report_sender_.reset(new net::ReportSender( 367 certificate_report_sender_.reset(new net::ReportSender(
368 main_request_context_.get(), net::ReportSender::DO_NOT_SEND_COOKIES)); 368 main_request_context_.get(), net::ReportSender::DO_NOT_SEND_COOKIES));
369 transport_security_state_->SetReportSender(certificate_report_sender_.get()); 369 transport_security_state_->SetReportSender(certificate_report_sender_.get());
370 370
371 // Take ownership over these parameters. 371 // Take ownership over these parameters.
372 cookie_settings_ = profile_params_->cookie_settings; 372 cookie_settings_ = profile_params_->cookie_settings;
373 host_content_settings_map_ = profile_params_->host_content_settings_map; 373 host_content_settings_map_ = profile_params_->host_content_settings_map;
374 374
375 main_request_context_->set_cert_verifier( 375 main_request_context_->set_cert_verifier(
376 io_thread_globals->cert_verifier.get()); 376 io_thread_globals->cert_verifier.get());
377 main_request_context_->set_ct_policy_enforcer(
378 io_thread_globals->ct_policy_enforcer.get());
Nico 2016/06/21 13:25:44 this looks unrelated?
379 main_request_context_->set_cert_transparency_verifier(
380 io_thread_globals->cert_transparency_verifier.get());
377 381
378 InitializeInternal(std::move(network_delegate), profile_params_.get(), 382 InitializeInternal(std::move(network_delegate), profile_params_.get(),
379 protocol_handlers); 383 protocol_handlers);
380 384
381 profile_params_.reset(); 385 profile_params_.reset();
382 initialized_ = true; 386 initialized_ = true;
383 } 387 }
384 388
385 void ChromeBrowserStateIOData::ApplyProfileParamsToContext( 389 void ChromeBrowserStateIOData::ApplyProfileParamsToContext(
386 net::URLRequestContext* context) const { 390 net::URLRequestContext* context) const {
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 return std::unique_ptr<net::HttpCache>( 484 return std::unique_ptr<net::HttpCache>(
481 new net::HttpCache(session, std::move(main_backend), true)); 485 new net::HttpCache(session, std::move(main_backend), true));
482 } 486 }
483 487
484 std::unique_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory( 488 std::unique_ptr<net::HttpCache> ChromeBrowserStateIOData::CreateHttpFactory(
485 net::HttpNetworkSession* shared_session, 489 net::HttpNetworkSession* shared_session,
486 std::unique_ptr<net::HttpCache::BackendFactory> backend) const { 490 std::unique_ptr<net::HttpCache::BackendFactory> backend) const {
487 return std::unique_ptr<net::HttpCache>( 491 return std::unique_ptr<net::HttpCache>(
488 new net::HttpCache(shared_session, std::move(backend), true)); 492 new net::HttpCache(shared_session, std::move(backend), true));
489 } 493 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698