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

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: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/crnet/test/crnet_http_tests.mm » ('j') | ios/crnet/test/crnet_http_tests.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/crnet/crnet_environment.mm
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index b8d46c87c097485e865648a45a10cde277026df8..5db03a9a392f86244cd08fafed2099774d4e36b6 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -328,15 +328,16 @@ void CrNetEnvironment::SetHTTPProtocolHandlerRegistered(bool registered) {
void CrNetEnvironment::ConfigureSdchOnNetworkThread() {
DCHECK(base::MessageLoop::current() == network_io_thread_->message_loop());
+ net::URLRequestContext* context =
+ main_context_getter_->GetURLRequestContext();
+ LOG(ERROR) << "ConfigureSdch: " << sdch_enabled_;
droger 2015/08/17 15:47:30 Remove LOG
Elly Fong-Jones 2015/08/17 17:26:49 Done.
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_);
« no previous file with comments | « no previous file | ios/crnet/test/crnet_http_tests.mm » ('j') | ios/crnet/test/crnet_http_tests.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698