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

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

Issue 2855693002: Reporting: Don't crash in ~ProfileIOData without URLRequestContextStorage (Closed)
Patch Set: Created 3 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 | « 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/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 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 certificate_report_sender_.reset(); 664 certificate_report_sender_.reset();
665 665
666 if (transport_security_state_) 666 if (transport_security_state_)
667 transport_security_state_->SetExpectCTReporter(nullptr); 667 transport_security_state_->SetExpectCTReporter(nullptr);
668 expect_ct_reporter_.reset(); 668 expect_ct_reporter_.reset();
669 669
670 if (transport_security_state_) 670 if (transport_security_state_)
671 transport_security_state_->SetRequireCTDelegate(nullptr); 671 transport_security_state_->SetRequireCTDelegate(nullptr);
672 672
673 // And the same for the ReportingService. 673 // And the same for the ReportingService.
674 main_request_context_storage()->set_reporting_service( 674 if (main_request_context_storage()) {
675 std::unique_ptr<net::ReportingService>()); 675 main_request_context_storage()->set_reporting_service(
676 std::unique_ptr<net::ReportingService>());
677 }
676 678
677 // TODO(ajwong): These AssertNoURLRequests() calls are unnecessary since they 679 // TODO(ajwong): These AssertNoURLRequests() calls are unnecessary since they
678 // are already done in the URLRequestContext destructor. 680 // are already done in the URLRequestContext destructor.
679 if (main_request_context_) 681 if (main_request_context_)
680 main_request_context_->AssertNoURLRequests(); 682 main_request_context_->AssertNoURLRequests();
681 if (extensions_request_context_) 683 if (extensions_request_context_)
682 extensions_request_context_->AssertNoURLRequests(); 684 extensions_request_context_->AssertNoURLRequests();
683 685
684 current_context = 0; 686 current_context = 0;
685 for (URLRequestContextMap::iterator it = app_request_context_map_.begin(); 687 for (URLRequestContextMap::iterator it = app_request_context_map_.begin();
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1313 void ProfileIOData::SetCookieSettingsForTesting( 1315 void ProfileIOData::SetCookieSettingsForTesting(
1314 content_settings::CookieSettings* cookie_settings) { 1316 content_settings::CookieSettings* cookie_settings) {
1315 DCHECK(!cookie_settings_.get()); 1317 DCHECK(!cookie_settings_.get());
1316 cookie_settings_ = cookie_settings; 1318 cookie_settings_ = cookie_settings;
1317 } 1319 }
1318 1320
1319 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1321 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1320 const GURL& url) const { 1322 const GURL& url) const {
1321 return url_blacklist_manager_->GetURLBlacklistState(url); 1323 return url_blacklist_manager_->GetURLBlacklistState(url);
1322 } 1324 }
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