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_impl_io_data.h" | 5 #include "chrome/browser/profiles/profile_impl_io_data.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <set> | 8 #include <set> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 std::move(protocol_handler_interceptor), context->network_delegate(), | 718 std::move(protocol_handler_interceptor), context->network_delegate(), |
719 context->host_resolver())); | 719 context->host_resolver())); |
720 context->SetJobFactory(std::move(top_job_factory)); | 720 context->SetJobFactory(std::move(top_job_factory)); |
721 | 721 |
722 return context; | 722 return context; |
723 } | 723 } |
724 | 724 |
725 net::URLRequestContext* ProfileImplIOData::InitializeMediaRequestContext( | 725 net::URLRequestContext* ProfileImplIOData::InitializeMediaRequestContext( |
726 net::URLRequestContext* original_context, | 726 net::URLRequestContext* original_context, |
727 const StoragePartitionDescriptor& partition_descriptor, | 727 const StoragePartitionDescriptor& partition_descriptor, |
728 const std::string& name) const { | 728 const char* name) const { |
729 // Copy most state from the original context. | 729 // Copy most state from the original context. |
730 MediaRequestContext* context = new MediaRequestContext(name); | 730 MediaRequestContext* context = new MediaRequestContext(name); |
731 context->CopyFrom(original_context); | 731 context->CopyFrom(original_context); |
732 | 732 |
733 // For in-memory context, return immediately after creating the new | 733 // For in-memory context, return immediately after creating the new |
734 // context before attaching a separate cache. It is important to return | 734 // context before attaching a separate cache. It is important to return |
735 // a new context rather than just reusing |original_context| because | 735 // a new context rather than just reusing |original_context| because |
736 // the caller expects to take ownership of the pointer. | 736 // the caller expects to take ownership of the pointer. |
737 if (partition_descriptor.in_memory) | 737 if (partition_descriptor.in_memory) |
738 return context; | 738 return context; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
812 const base::Closure& completion) { | 812 const base::Closure& completion) { |
813 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 813 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
814 DCHECK(initialized()); | 814 DCHECK(initialized()); |
815 | 815 |
816 DCHECK(transport_security_state()); | 816 DCHECK(transport_security_state()); |
817 // Completes synchronously. | 817 // Completes synchronously. |
818 transport_security_state()->DeleteAllDynamicDataSince(time); | 818 transport_security_state()->DeleteAllDynamicDataSince(time); |
819 DCHECK(http_server_properties_manager_); | 819 DCHECK(http_server_properties_manager_); |
820 http_server_properties_manager_->Clear(completion); | 820 http_server_properties_manager_->Clear(completion); |
821 } | 821 } |
OLD | NEW |