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

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

Issue 1922403002: Move bool enable_brotli from HttpNetworkSession::Params (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unittest fix Created 4 years, 7 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
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_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 1004 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 1015
1016 IOThread* const io_thread = profile_params_->io_thread; 1016 IOThread* const io_thread = profile_params_->io_thread;
1017 IOThread::Globals* const io_thread_globals = io_thread->globals(); 1017 IOThread::Globals* const io_thread_globals = io_thread->globals();
1018 const base::CommandLine& command_line = 1018 const base::CommandLine& command_line =
1019 *base::CommandLine::ForCurrentProcess(); 1019 *base::CommandLine::ForCurrentProcess();
1020 1020
1021 // Create the common request contexts. 1021 // Create the common request contexts.
1022 main_request_context_.reset(new net::URLRequestContext()); 1022 main_request_context_.reset(new net::URLRequestContext());
1023 extensions_request_context_.reset(new net::URLRequestContext()); 1023 extensions_request_context_.reset(new net::URLRequestContext());
1024 1024
1025 main_request_context_->set_enable_brotli(io_thread_globals->enable_brotli);
1026
1025 std::unique_ptr<ChromeNetworkDelegate> network_delegate( 1027 std::unique_ptr<ChromeNetworkDelegate> network_delegate(
1026 new ChromeNetworkDelegate( 1028 new ChromeNetworkDelegate(
1027 #if defined(ENABLE_EXTENSIONS) 1029 #if defined(ENABLE_EXTENSIONS)
1028 io_thread_globals->extension_event_router_forwarder.get(), 1030 io_thread_globals->extension_event_router_forwarder.get(),
1029 #else 1031 #else
1030 NULL, 1032 NULL,
1031 #endif 1033 #endif
1032 &enable_referrers_, io_thread->GetMetricsDataUseForwarder())); 1034 &enable_referrers_, io_thread->GetMetricsDataUseForwarder()));
1033 #if defined(ENABLE_EXTENSIONS) 1035 #if defined(ENABLE_EXTENSIONS)
1034 network_delegate->set_extension_info_map( 1036 network_delegate->set_extension_info_map(
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 base::WrapUnique(new DevToolsNetworkTransactionFactory( 1329 base::WrapUnique(new DevToolsNetworkTransactionFactory(
1328 network_controller_handle_.GetController(), shared_session)), 1330 network_controller_handle_.GetController(), shared_session)),
1329 std::move(backend), true /* set_up_quic_server_info */)); 1331 std::move(backend), true /* set_up_quic_server_info */));
1330 } 1332 }
1331 1333
1332 void ProfileIOData::SetCookieSettingsForTesting( 1334 void ProfileIOData::SetCookieSettingsForTesting(
1333 content_settings::CookieSettings* cookie_settings) { 1335 content_settings::CookieSettings* cookie_settings) {
1334 DCHECK(!cookie_settings_.get()); 1336 DCHECK(!cookie_settings_.get());
1335 cookie_settings_ = cookie_settings; 1337 cookie_settings_ = cookie_settings;
1336 } 1338 }
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | net/http/http_network_session.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698