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

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

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 (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 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
907 chrome_browser_net::Predictor* ProfileIOData::GetPredictor() { 907 chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
908 return nullptr; 908 return nullptr;
909 } 909 }
910 910
911 void ProfileIOData::set_data_reduction_proxy_io_data( 911 void ProfileIOData::set_data_reduction_proxy_io_data(
912 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData> 912 std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
913 data_reduction_proxy_io_data) const { 913 data_reduction_proxy_io_data) const {
914 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data); 914 data_reduction_proxy_io_data_ = std::move(data_reduction_proxy_io_data);
915 } 915 }
916 916
917 base::WeakPtr<net::HttpServerProperties> 917 net::HttpServerProperties* ProfileIOData::http_server_properties() const {
918 ProfileIOData::http_server_properties() const { 918 return http_server_properties_.get();
919 return http_server_properties_->GetWeakPtr();
920 } 919 }
921 920
922 void ProfileIOData::set_http_server_properties( 921 void ProfileIOData::set_http_server_properties(
923 std::unique_ptr<net::HttpServerProperties> http_server_properties) const { 922 std::unique_ptr<net::HttpServerProperties> http_server_properties) const {
924 http_server_properties_ = std::move(http_server_properties); 923 http_server_properties_ = std::move(http_server_properties);
925 } 924 }
926 925
927 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data) 926 ProfileIOData::ResourceContext::ResourceContext(ProfileIOData* io_data)
928 : io_data_(io_data), 927 : io_data_(io_data),
929 host_resolver_(NULL), 928 host_resolver_(NULL),
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
1356 void ProfileIOData::SetCookieSettingsForTesting( 1355 void ProfileIOData::SetCookieSettingsForTesting(
1357 content_settings::CookieSettings* cookie_settings) { 1356 content_settings::CookieSettings* cookie_settings) {
1358 DCHECK(!cookie_settings_.get()); 1357 DCHECK(!cookie_settings_.get());
1359 cookie_settings_ = cookie_settings; 1358 cookie_settings_ = cookie_settings;
1360 } 1359 }
1361 1360
1362 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1361 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1363 const GURL& url) const { 1362 const GURL& url) const {
1364 return url_blacklist_manager_->GetURLBlacklistState(url); 1363 return url_blacklist_manager_->GetURLBlacklistState(url);
1365 } 1364 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698