Offline Pages - Policy cleanup

chrome/browser/android/offline_pages/background_loader_offliner.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/offline_pages/background_loader_offliner.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sys_info.h"
@@ skipping 101 matching lines @@
     return data->offliner();
   return nullptr;
 }
 
 bool BackgroundLoaderOffliner::LoadAndSave(
     const SavePageRequest& request,
     const CompletionCallback& completion_callback,
     const ProgressCallback& progress_callback) {
   DCHECK(completion_callback);
   DCHECK(progress_callback);
+  DCHECK(offline_page_model_);
 
   if (pending_request_) {
     DVLOG(1) << "Already have pending request";
     return false;
   }
 
-  // Do not allow loading for custom tabs clients if 3rd party cookies blocked.
-  // TODO(dewittj): Revise api to specify policy rather than hard code to
-  // name_space.
-  if (request.client_id().name_space == kCCTNamespace &&
+  ClientPolicyController* policy_controller =
+      offline_page_model_->GetPolicyController();
+  if (policy_controller->IsDisabledWhenPrefetchDisabled(
+          request.client_id().name_space) &&
       (AreThirdPartyCookiesBlocked(browser_context_) ||
        IsNetworkPredictionDisabled(browser_context_))) {
     DVLOG(1) << "WARNING: Unable to load when 3rd party cookies blocked or "
              << "prediction disabled";
     // Record user metrics for third party cookies being disabled or network
     // prediction being disabled.
     if (AreThirdPartyCookiesBlocked(browser_context_)) {
       UMA_HISTOGRAM_ENUMERATION(
           "OfflinePages.Background.CctApiDisableStatus",
           static_cast<int>(OfflinePagesCctApiPrerenderAllowedStatus::
@@ skipping 331 matching lines @@
   // Given the choice between int and double, we choose to implicitly convert to
   // a double since it maintains more precision (we can get a longer time in
   // milliseconds than we can with a 2 bit int, 53 bits vs 32).
   double delay = delay_so_far.InMilliseconds();
   signal_data_.SetDouble(signal_name, delay);
 }
 
 }  // namespace offline_pages
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(offline_pages::OfflinerData);