[Remote suggestions] Prioritize wifi for soft fetches.

components/ntp_snippets/remote/remote_suggestions_scheduler_impl.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_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_SCHEDULER_IMPL_H_
 #define COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_SCHEDULER_IMPL_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 43 matching lines @@
   void OnHistoryCleared() override;
   void RescheduleFetching() override;
   bool AcquireQuotaForInteractiveFetch() override;
   void OnInteractiveFetchFinished(Status fetch_status) override;
   void OnPersistentSchedulerWakeUp() override;
   void OnBrowserForegrounded() override;
   void OnBrowserColdStart() override;
   void OnNTPOpened() override;
 
  private:
-  // Abstract description of the fetching schedule.
+  // Abstract description of the fetching schedule. See the enum
+  // FetchingInterval for more documentation.
   struct FetchingSchedule {
     static FetchingSchedule Empty();
     bool operator==(const FetchingSchedule& other) const;
     bool operator!=(const FetchingSchedule& other) const;
     bool is_empty() const;
 
     base::TimeDelta interval_persistent_wifi;
     base::TimeDelta interval_persistent_fallback;
-    base::TimeDelta interval_soft_on_usage_event;
-    base::TimeDelta interval_soft_on_ntp_opened;
+    base::TimeDelta interval_soft_wifi;
+    base::TimeDelta interval_soft_fallback;
   };
 
   enum class TriggerType;
 
   // After the call, updates will be scheduled in the future. Idempotent, can be
   // run any time later without impacting the current schedule.
   // If you want to enforce rescheduling, call Unschedule() and then Schedule().
   void StartScheduling();
 
   // After the call, no updates will happen before another call to Schedule().
   // Idempotent, can be run any time later without impacting the current
   // schedule.
   void StopScheduling();
 
-  // Trigger a background refetch for the given |trigger| if enabled.
-  void RefetchInTheBackgroundIfEnabled(TriggerType trigger);
-
-  // Trigger the background refetch.
-  void RefetchInTheBackground();
+  // Trigger a background refetch for the given |trigger| if enabled and if the
+  // timing is appropriate for another fetch.
+  void RefetchInTheBackgroundIfAppropriate(TriggerType trigger);
 
   // Checks whether it is time to perform a soft background fetch, according to
   // |schedule|.
-  bool ShouldRefetchInTheBackgroundNow(TriggerType trigger);
+  bool ShouldRefetchInTheBackgroundNow();
 
   // Returns whether background fetching (for the given |trigger|) is disabled.
   bool BackgroundFetchesDisabled(TriggerType trigger) const;
 
   // Returns true if quota is available for another request.
   bool AcquireQuota(bool interactive_request);
 
   // Callback after RefetchInTheBackground is completed.
   void RefetchInTheBackgroundFinished(Status fetch_status);
 
@@ skipping 45 matching lines @@
   std::set<TriggerType> enabled_triggers_;
 
   base::Time background_fetches_allowed_after_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteSuggestionsSchedulerImpl);
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_REMOTE_REMOTE_SUGGESTIONS_SCHEDULER_IMPL_H_