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

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

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 799 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 810
811 net::URLRequestContext* ProfileIOData::GetIsolatedAppRequestContext( 811 net::URLRequestContext* ProfileIOData::GetIsolatedAppRequestContext(
812 net::URLRequestContext* main_context, 812 net::URLRequestContext* main_context,
813 const StoragePartitionDescriptor& partition_descriptor, 813 const StoragePartitionDescriptor& partition_descriptor,
814 std::unique_ptr<ProtocolHandlerRegistry::JobInterceptorFactory> 814 std::unique_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
815 protocol_handler_interceptor, 815 protocol_handler_interceptor,
816 content::ProtocolHandlerMap* protocol_handlers, 816 content::ProtocolHandlerMap* protocol_handlers,
817 content::URLRequestInterceptorScopedVector request_interceptors) const { 817 content::URLRequestInterceptorScopedVector request_interceptors) const {
818 DCHECK(initialized_); 818 DCHECK(initialized_);
819 net::URLRequestContext* context = NULL; 819 net::URLRequestContext* context = NULL;
820 if (ContainsKey(app_request_context_map_, partition_descriptor)) { 820 if (base::ContainsKey(app_request_context_map_, partition_descriptor)) {
821 context = app_request_context_map_[partition_descriptor]; 821 context = app_request_context_map_[partition_descriptor];
822 } else { 822 } else {
823 context = AcquireIsolatedAppRequestContext( 823 context = AcquireIsolatedAppRequestContext(
824 main_context, partition_descriptor, 824 main_context, partition_descriptor,
825 std::move(protocol_handler_interceptor), protocol_handlers, 825 std::move(protocol_handler_interceptor), protocol_handlers,
826 std::move(request_interceptors)); 826 std::move(request_interceptors));
827 app_request_context_map_[partition_descriptor] = context; 827 app_request_context_map_[partition_descriptor] = context;
828 } 828 }
829 DCHECK(context); 829 DCHECK(context);
830 return context; 830 return context;
831 } 831 }
832 832
833 net::URLRequestContext* ProfileIOData::GetIsolatedMediaRequestContext( 833 net::URLRequestContext* ProfileIOData::GetIsolatedMediaRequestContext(
834 net::URLRequestContext* app_context, 834 net::URLRequestContext* app_context,
835 const StoragePartitionDescriptor& partition_descriptor) const { 835 const StoragePartitionDescriptor& partition_descriptor) const {
836 DCHECK(initialized_); 836 DCHECK(initialized_);
837 net::URLRequestContext* context = NULL; 837 net::URLRequestContext* context = NULL;
838 if (ContainsKey(isolated_media_request_context_map_, partition_descriptor)) { 838 if (base::ContainsKey(isolated_media_request_context_map_,
839 partition_descriptor)) {
839 context = isolated_media_request_context_map_[partition_descriptor]; 840 context = isolated_media_request_context_map_[partition_descriptor];
840 } else { 841 } else {
841 context = AcquireIsolatedMediaRequestContext(app_context, 842 context = AcquireIsolatedMediaRequestContext(app_context,
842 partition_descriptor); 843 partition_descriptor);
843 isolated_media_request_context_map_[partition_descriptor] = context; 844 isolated_media_request_context_map_[partition_descriptor] = context;
844 } 845 }
845 DCHECK(context); 846 DCHECK(context);
846 return context; 847 return context;
847 } 848 }
848 849
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 void ProfileIOData::SetCookieSettingsForTesting( 1376 void ProfileIOData::SetCookieSettingsForTesting(
1376 content_settings::CookieSettings* cookie_settings) { 1377 content_settings::CookieSettings* cookie_settings) {
1377 DCHECK(!cookie_settings_.get()); 1378 DCHECK(!cookie_settings_.get());
1378 cookie_settings_ = cookie_settings; 1379 cookie_settings_ = cookie_settings;
1379 } 1380 }
1380 1381
1381 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState( 1382 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
1382 const GURL& url) const { 1383 const GURL& url) const {
1383 return url_blacklist_manager_->GetURLBlacklistState(url); 1384 return url_blacklist_manager_->GetURLBlacklistState(url);
1384 } 1385 }
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton_posix.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698