Always get device conditions from Java for every attempt.

components/offline_pages/core/background/scheduler_stub.h

Index: components/offline_pages/core/background/scheduler_stub.h
diff --git a/components/offline_pages/core/background/scheduler_stub.h b/components/offline_pages/core/background/scheduler_stub.h
index 7300468422ecb549ca15f574c3f85aae3de6be10..8748c2b2d3d71add6f7771a64ed0609b0e00ab01 100644
--- a/components/offline_pages/core/background/scheduler_stub.h
+++ b/components/offline_pages/core/background/scheduler_stub.h
@@ -24,20 +24,27 @@ class SchedulerStub : public Scheduler {
   // Unschedules the currently scheduled task, if any.
   void Unschedule() override;
 
+  // Get the current device conditions from the android APIs

[dougarnett, 2017/01/27 23:15:56]

nit - period

[Pete Williamson, 2017/01/28 00:24:46]

Done.

+  DeviceConditions& GetCurrentDeviceConditions() override;
+
   bool schedule_called() const { return schedule_called_; }
 
   bool backup_schedule_called() const { return backup_schedule_called_; }
 
   bool unschedule_called() const { return unschedule_called_; }
 
-  TriggerConditions const* conditions() const { return &conditions_; }
+  TriggerConditions const* trigger_conditions() const {
+    return &trigger_conditions_;
+  }
 
  private:
   bool schedule_called_;
   bool backup_schedule_called_;
   bool unschedule_called_;
+  bool get_current_device_conditions_called_;
   long schedule_delay_;
-  TriggerConditions conditions_;
+  DeviceConditions device_conditions_;
+  TriggerConditions trigger_conditions_;
 };
 
 }  // namespace offline_pages