ios/crnet/crnet_environment.mm - Issue 1291673003: SdchManager: remove EnableSdchSupport

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1291673003: SdchManager: remove EnableSdchSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Delete obsolete test 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:

Index: ios/crnet/crnet_environment.mm

diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm

index b8d46c87c097485e865648a45a10cde277026df8..ffeda97c3f2c496002065ac9a6686bc2f62d5b00 100644

--- a/ios/crnet/crnet_environment.mm

+++ b/ios/crnet/crnet_environment.mm

@@ -328,15 +328,15 @@ void CrNetEnvironment::SetHTTPProtocolHandlerRegistered(bool registered) {

void CrNetEnvironment::ConfigureSdchOnNetworkThread() {

DCHECK(base::MessageLoop::current() == network_io_thread_->message_loop());

+ net::URLRequestContext* context =

+ main_context_getter_->GetURLRequestContext();

if (!sdch_enabled_) {

- net::SdchManager::EnableSdchSupport(false);

+ DCHECK_EQ(static_cast<net::SdchManager*>(nullptr), context->sdch_manager());

return;

}

sdch_manager_.reset(new net::SdchManager());

- net::URLRequestContext* context =

- main_context_getter_->GetURLRequestContext();

sdch_owner_.reset(new net::SdchOwner(sdch_manager_.get(), context));

if (!sdch_pref_store_filename_.empty()) {

base::FilePath path(sdch_pref_store_filename_);