Offline Pages - Policy cleanup

chrome/browser/android/offline_pages/prerendering_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/prerendering_offliner.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sys_info.h"
@@ skipping 166 matching lines @@
   }
   saved_on_last_retry_ = false;
   completion_callback_.Run(request, save_status);
 }
 
 bool PrerenderingOffliner::LoadAndSave(
     const SavePageRequest& request,
     const CompletionCallback& completion_callback,
     const ProgressCallback& progress_callback) {
   DCHECK(!pending_request_.get());
+  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 122 matching lines @@
           base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) {
     DVLOG(1) << "App became active, canceling current offlining request";
     // No need to check the return value or complete early, as false would
     // indicate that there was no request, in which case the state change is
     // ignored.
     Cancel(
         base::Bind(HandleApplicationStateChangeCancel, completion_callback_));
   }
 }
 }  // namespace offline_pages