Chromium Code Reviews| Index: content/browser/storage_partition_impl_map.cc |
| diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc |
| index 5100cbd721447235d13c73fd719dbfc5e5f47026..a9037e1bd63c3f048f8ae35bf4f1507bd4d4161d 100644 |
| --- a/content/browser/storage_partition_impl_map.cc |
| +++ b/content/browser/storage_partition_impl_map.cc |
| @@ -42,6 +42,7 @@ |
| #include "content/public/browser/storage_partition.h" |
| #include "content/public/common/content_constants.h" |
| #include "content/public/common/content_switches.h" |
| +#include "content/public/common/origin_trial_policy.h" |
| #include "content/public/common/url_constants.h" |
| #include "crypto/sha2.h" |
| #include "net/url_request/url_request_context.h" |
| @@ -445,8 +446,12 @@ StoragePartitionImpl* StoragePartitionImplMap::Get( |
| request_interceptors.push_back( |
| ServiceWorkerRequestHandler::CreateInterceptor( |
| browser_context_->GetResourceContext()).release()); |
| + OriginTrialPolicy* origin_trial_policy = |
| + GetContentClient()->GetOriginTrialPolicy(); |
| if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| - switches::kEnableExperimentalWebPlatformFeatures)) { |
| + switches::kEnableExperimentalWebPlatformFeatures) || |
| + !origin_trial_policy || |
|
pfeldman
2016/08/12 18:49:23
ditto
|
| + !origin_trial_policy->IsFeatureDisabled("ForeignFetch")) { |
| request_interceptors.push_back( |
| ForeignFetchRequestHandler::CreateInterceptor( |
| browser_context_->GetResourceContext()) |