Adjust scheduling for non-user requested items

components/offline_pages/background/request_picker_unittest.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 "components/offline_pages/background/request_picker.h"
 
 #include "base/bind.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
@@ skipping 75 matching lines @@
 
   void SetUp() override;
 
   void PumpLoop();
 
   void AddRequestDone(RequestQueue::AddRequestResult result,
                       const SavePageRequest& request);
 
   void RequestPicked(const SavePageRequest& request);
 
-  void RequestQueueEmpty();
+  void RequestQueueEmpty(const bool non_user_requested_tasks_remaining);
 
   void QueueRequestsAndChooseOne(const SavePageRequest& request1,
                                  const SavePageRequest& request2);
 
   RequestNotifierStub* GetNotifier() { return notifier_.get(); }
 
  protected:
   // The request queue is simple enough we will use a real queue with a memory
   // store instead of a stub.
   std::unique_ptr<RequestQueue> queue_;
@@ skipping 29 matching lines @@
   task_runner_->RunUntilIdle();
 }
 
 void RequestPickerTest::AddRequestDone(RequestQueue::AddRequestResult result,
                                        const SavePageRequest& request) {}
 
 void RequestPickerTest::RequestPicked(const SavePageRequest& request) {
   last_picked_.reset(new SavePageRequest(request));
 }
 
-void RequestPickerTest::RequestQueueEmpty() {
+void RequestPickerTest::RequestQueueEmpty(

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

rename here too

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

Done.

+    const bool non_user_requested_tasks_remaining) {
   request_queue_empty_called_ = true;
 }
 
 // Test helper to queue the two given requests and then pick one of them per
 // configured policy.
 void RequestPickerTest::QueueRequestsAndChooseOne(
     const SavePageRequest& request1, const SavePageRequest& request2) {
   DeviceConditions conditions;
   // Add test requests on the Queue.
   queue_->AddRequest(request1, base::Bind(&RequestPickerTest::AddRequestDone,
@@ skipping 206 matching lines @@
   // With default policy settings, we should choose the earlier request.
   // However, we will make the earlier reqeust exceed the limit.
   request1.set_completed_attempt_count(policy_->GetMaxCompletedTries());
 
   QueueRequestsAndChooseOne(request1, request2);
 
   EXPECT_EQ(kRequestId2, last_picked_->request_id());
   EXPECT_FALSE(request_queue_empty_called_);
 }
 }  // namespace offline_pages