[Offline Pages] Define separate watchdog timeout for concurrent bg loads

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 = 4;
 const int kMaxCompletedTries = 1;
 const int kBackgroundProcessingTimeBudgetSeconds = 170;
-const int kSinglePageTimeLimitSeconds = 120;
+const int kSinglePageTimeLimitWhenBackgroundScheduledSeconds = 120;
+const int kSinglePageTimeLimitForConcurrentLoadSeconds = 300;

[Pete Williamson, 2016/10/12 22:33:24]

I wonder if we can improve the naming here a bit more.

It isn't really concurrent (at least not once Dimich's change goes in).
It isn't really foreground, it is technically a background load when chrome is
in the foreground.

Maybe kSinglePageTimeLimitForImmediateBackgroundLoadSeconds ?

[dougarnett, 2016/10/13 19:46:44]

Done.

 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 57 matching lines @@
     return 25;
   }
 
   // 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;
+  int GetSinglePageTimeLimitInSeconds(bool is_background_scheduled) const {

[Pete Williamson, 2016/10/12 22:33:24]

maybe rename the variable to indicate scheduled_from_gcm or
scheduled_from_tab_helper

[dougarnett, 2016/10/13 19:46:44]

trying separate methods

+    return is_background_scheduled
+               ? kSinglePageTimeLimitWhenBackgroundScheduledSeconds
+               : kSinglePageTimeLimitForConcurrentLoadSeconds;
   }
 
   // How long we allow requests to remain in the system before giving up.
   int GetRequestExpirationTimeInSeconds() const {
     return kRequestExpirationTimeInSeconds;
   }
 
  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_