OLD | NEW |
---|---|
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 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
564 } | 564 } |
565 | 565 |
566 ProfileIOData::MediaRequestContext::~MediaRequestContext() { | 566 ProfileIOData::MediaRequestContext::~MediaRequestContext() { |
567 AssertNoURLRequests(); | 567 AssertNoURLRequests(); |
568 } | 568 } |
569 | 569 |
570 ProfileIOData::AppRequestContext::AppRequestContext() { | 570 ProfileIOData::AppRequestContext::AppRequestContext() { |
571 } | 571 } |
572 | 572 |
573 void ProfileIOData::AppRequestContext::SetCookieStore( | 573 void ProfileIOData::AppRequestContext::SetCookieStore( |
574 net::CookieStore* cookie_store) { | 574 scoped_ptr<net::CookieStore> cookie_store) { |
575 cookie_store_ = cookie_store; | 575 cookie_store_ = std::move(cookie_store); |
576 set_cookie_store(cookie_store); | 576 set_cookie_store(cookie_store_.get()); |
Randy Smith (Not in Mondays)
2016/02/29 22:37:45
Not part of this CL, but I think it's dangerously
mmenke
2016/02/29 23:00:29
I'd really like to move to a world where all URLRe
| |
577 } | 577 } |
578 | 578 |
579 void ProfileIOData::AppRequestContext::SetHttpTransactionFactory( | 579 void ProfileIOData::AppRequestContext::SetHttpTransactionFactory( |
580 scoped_ptr<net::HttpTransactionFactory> http_factory) { | 580 scoped_ptr<net::HttpTransactionFactory> http_factory) { |
581 http_factory_ = std::move(http_factory); | 581 http_factory_ = std::move(http_factory); |
582 set_http_transaction_factory(http_factory_.get()); | 582 set_http_transaction_factory(http_factory_.get()); |
583 } | 583 } |
584 | 584 |
585 void ProfileIOData::AppRequestContext::SetJobFactory( | 585 void ProfileIOData::AppRequestContext::SetJobFactory( |
586 scoped_ptr<net::URLRequestJobFactory> job_factory) { | 586 scoped_ptr<net::URLRequestJobFactory> job_factory) { |
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory( | 1322 make_scoped_ptr(new DevToolsNetworkTransactionFactory( |
1323 network_controller_handle_.GetController(), shared_session)), | 1323 network_controller_handle_.GetController(), shared_session)), |
1324 std::move(backend), true /* set_up_quic_server_info */)); | 1324 std::move(backend), true /* set_up_quic_server_info */)); |
1325 } | 1325 } |
1326 | 1326 |
1327 void ProfileIOData::SetCookieSettingsForTesting( | 1327 void ProfileIOData::SetCookieSettingsForTesting( |
1328 content_settings::CookieSettings* cookie_settings) { | 1328 content_settings::CookieSettings* cookie_settings) { |
1329 DCHECK(!cookie_settings_.get()); | 1329 DCHECK(!cookie_settings_.get()); |
1330 cookie_settings_ = cookie_settings; | 1330 cookie_settings_ = cookie_settings; |
1331 } | 1331 } |
OLD | NEW |