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

Side by Side Diff: ios/chrome/browser/ios_chrome_io_thread.mm

Issue 1842933003: Disable LogChannelIDAndCookieStores NOTREACHED. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/ios_chrome_io_thread.h" 5 #include "ios/chrome/browser/ios_chrome_io_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 globals_->ssl_config_service = GetSSLConfigService(); 440 globals_->ssl_config_service = GetSSLConfigService();
441 441
442 CreateDefaultAuthHandlerFactory(); 442 CreateDefaultAuthHandlerFactory();
443 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl()); 443 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl());
444 // In-memory cookie store. 444 // In-memory cookie store.
445 globals_->system_cookie_store.reset(new net::CookieMonster(nullptr, nullptr)); 445 globals_->system_cookie_store.reset(new net::CookieMonster(nullptr, nullptr));
446 // In-memory channel ID store. 446 // In-memory channel ID store.
447 globals_->system_channel_id_service.reset( 447 globals_->system_channel_id_service.reset(
448 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr), 448 new net::ChannelIDService(new net::DefaultChannelIDStore(nullptr),
449 base::WorkerPool::GetTaskRunner(true))); 449 base::WorkerPool::GetTaskRunner(true)));
450 globals_->system_cookie_store->SetChannelIDServiceID(
451 globals_->system_channel_id_service->GetUniqueID());
450 globals_->http_user_agent_settings.reset(new net::StaticHttpUserAgentSettings( 452 globals_->http_user_agent_settings.reset(new net::StaticHttpUserAgentSettings(
451 std::string(), web::GetWebClient()->GetUserAgent(false))); 453 std::string(), web::GetWebClient()->GetUserAgent(false)));
452 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpPort)) { 454 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpPort)) {
453 globals_->testing_fixed_http_port = 455 globals_->testing_fixed_http_port =
454 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpPort); 456 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpPort);
455 } 457 }
456 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpsPort)) { 458 if (command_line.HasSwitch(switches::kIOSTestingFixedHttpsPort)) {
457 globals_->testing_fixed_https_port = 459 globals_->testing_fixed_https_port =
458 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpsPort); 460 GetSwitchValueAsInt(command_line, switches::kIOSTestingFixedHttpsPort);
459 } 461 }
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
1043 1045
1044 globals->system_http_network_session.reset( 1046 globals->system_http_network_session.reset(
1045 new net::HttpNetworkSession(system_params)); 1047 new net::HttpNetworkSession(system_params));
1046 globals->system_http_transaction_factory.reset( 1048 globals->system_http_transaction_factory.reset(
1047 new net::HttpNetworkLayer(globals->system_http_network_session.get())); 1049 new net::HttpNetworkLayer(globals->system_http_network_session.get()));
1048 context->set_http_transaction_factory( 1050 context->set_http_transaction_factory(
1049 globals->system_http_transaction_factory.get()); 1051 globals->system_http_transaction_factory.get());
1050 1052
1051 return context; 1053 return context;
1052 } 1054 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698