Adjust scheduling for non-user requested items

components/offline_pages/background/offliner_policy.h

 // 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.
 
 #ifndef COMPONENTS_OFFLINE_PAGES_BACKGROUND_OFFLINER_POLICY_H_
 #define COMPONENTS_OFFLINE_PAGES_BACKGROUND_OFFLINER_POLICY_H_
 
 namespace {
 const int kMaxStartedTries = 5;
 const int kMaxCompletedTries = 1;
 const int kBackgroundProcessingTimeBudgetSeconds = 170;
 const int kSinglePageTimeLimitSeconds = 120;
-const int kMinimumBatteryPercentageForNonUserRequestOfflining = 50;
 const int kRequestExpirationTimeInSeconds = 60 * 60 * 24 * 7;
 }  // namespace
 
 namespace offline_pages {
 
 // Policy for the Background Offlining system.  Some policy will belong to the
 // RequestCoordinator, some to the RequestQueue, and some to the Offliner.
 class OfflinerPolicy {
  public:
   OfflinerPolicy()
@@ skipping 34 matching lines @@
 
   // The max number of times we will start a request.  Not all started attempts
   // will complete.  This may be caused by prerenderer issues or chromium being
   // swapped out of memory.
   int GetMaxStartedTries() const { return max_started_tries_; }
 
   // The max number of times we will retry a request when the attempt
   // completed, but failed.
   int GetMaxCompletedTries() const { return max_completed_tries_; }
 
-  bool PowerRequiredForUserRequestedPage() const { return false; }
+  bool PowerRequired(bool user_requested) const {
+    if (user_requested)
+      return false;
+    return true;
+  }
 
-  bool PowerRequiredForNonUserRequestedPage() const { return true; }
+  bool UnmeteredNetworkRequired(bool user_requested) const {
+    if (user_requested)
+      return false;
+    return true;
+  }
 
-  bool UnmeteredNetworkRequiredForUserRequestedPage() const { return false; }
+  int BatteryPercentageRequired(bool user_requested) const {
+    if (user_requested)
+      return 0;
+    // This is so low because we require the device to be plugged in and
+    // charging.  If we decide to allow non-user requested pages when not
+    // plugged in, we should raise this somewhat higher.
+    return 25;
+  }
 
-  bool UnmeteredNetworkRequiredForNonUserRequestedPage() const { return true; }
-
-  int BatteryPercentageRequiredForUserRequestedPage() const { return 0; }
-
-  // This is so low because we require the device to be plugged in and charging.
-  // If we decide to allow non-user requested pages when not plugged in, we
-  // should raise this somewhat higher.
   int BatteryPercentageRequiredForNonUserRequestedPage() const { return 25; }

[dougarnett, 2016/08/29 15:47:22]

delete this one too?

[Pete Williamson, 2016/09/01 00:10:31]

Done.

 
   // How many seconds to keep trying new pages for, before we give up,  and
   // return to the scheduler.
   int GetBackgroundProcessingTimeBudgetSeconds() const {
     return kBackgroundProcessingTimeBudgetSeconds;
   }
 
   // How long do we allow a page to load before giving up on it
   int GetSinglePageTimeLimitInSeconds() const {
     return kSinglePageTimeLimitSeconds;
   }
 
   // How long we allow requests to remain in the system before giving up.
   int GetRequestExpirationTimeInSeconds() const {
     return kRequestExpirationTimeInSeconds;
   }
 
-  // How much battery must we have before fetching a page not explicitly
-  // requested by the user?
-  int GetMinimumBatteryPercentageForNonUserRequestOfflining() const {
-    return kMinimumBatteryPercentageForNonUserRequestOfflining;
-  }
-
  private:
   bool prefer_untried_requests_;
   bool prefer_earlier_requests_;
   bool retry_count_is_more_important_than_recency_;
   int max_started_tries_;
   int max_completed_tries_;
 };
 }
 
 #endif  // COMPONENTS_OFFLINE_PAGES_BACKGROUND_OFFLINER_POLICY_H_