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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 10096017: Partially reland r131930. Only assert on system context leaks this time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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/io_thread.h" 5 #include "chrome/browser/io_thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 void IOThread::CleanUp() { 458 void IOThread::CleanUp() {
459 base::debug::LeakTracker<SafeBrowsingURLRequestContext>::CheckForLeaks(); 459 base::debug::LeakTracker<SafeBrowsingURLRequestContext>::CheckForLeaks();
460 460
461 delete sdch_manager_; 461 delete sdch_manager_;
462 sdch_manager_ = NULL; 462 sdch_manager_ = NULL;
463 463
464 #if defined(USE_NSS) 464 #if defined(USE_NSS)
465 net::ShutdownNSSHttpIO(); 465 net::ShutdownNSSHttpIO();
466 #endif // defined(USE_NSS) 466 #endif // defined(USE_NSS)
467 467
468 globals_->system_request_context->AssertNoURLRequests();
469
468 system_url_request_context_getter_ = NULL; 470 system_url_request_context_getter_ = NULL;
469 471
470 // Release objects that the net::URLRequestContext could have been pointing 472 // Release objects that the net::URLRequestContext could have been pointing
471 // to. 473 // to.
472 474
473 // This must be reset before the ChromeNetLog is destroyed. 475 // This must be reset before the ChromeNetLog is destroyed.
474 network_change_observer_.reset(); 476 network_change_observer_.reset();
475 477
476 system_proxy_config_service_.reset(); 478 system_proxy_config_service_.reset();
477 479
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 new net::HttpNetworkLayer( 599 new net::HttpNetworkLayer(
598 new net::HttpNetworkSession(system_params))); 600 new net::HttpNetworkSession(system_params)));
599 globals_->system_ftp_transaction_factory.reset( 601 globals_->system_ftp_transaction_factory.reset(
600 new net::FtpNetworkLayer(globals_->host_resolver.get())); 602 new net::FtpNetworkLayer(globals_->host_resolver.get()));
601 globals_->system_request_context = 603 globals_->system_request_context =
602 ConstructSystemRequestContext(globals_, net_log_); 604 ConstructSystemRequestContext(globals_, net_log_);
603 605
604 sdch_manager_->set_sdch_fetcher( 606 sdch_manager_->set_sdch_fetcher(
605 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); 607 new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
606 } 608 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698