Reorder functions.

components/offline_pages/background/request_coordinator.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_coordinator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 59 matching lines @@
 
   // Inform the scheduler that we have an outstanding task.
   // TODO(petewil): Determine trigger conditions from policy.
   scheduler_->Schedule(GetTriggerConditionsForUserRequest());
 }
 
 // Called in response to updating a request in the request queue.
 void RequestCoordinator::UpdateRequestCallback(
     RequestQueue::UpdateRequestResult result) {}
 
-// Called by the request picker when a request has been picked.
-void RequestCoordinator::RequestPicked(const SavePageRequest& request) {
-  // Send the request on to the offliner.
-  SendRequestToOffliner(request);
-}
-
-void RequestCoordinator::RequestQueueEmpty() {
-  // Clear the outstanding "safety" task in the scheduler.
-  scheduler_->Unschedule();
-  // Return control to the scheduler when there is no more to do.
-  scheduler_callback_.Run(true);
+void RequestCoordinator::StopProcessing() {
+  is_canceled_ = true;
+  if (offliner_ && is_busy_)
+    offliner_->Cancel();
 }
 
 // Returns true if the caller should expect a callback, false otherwise. For
 // instance, this would return false if a request is already in progress.
 bool RequestCoordinator::StartProcessing(
     const DeviceConditions& device_conditions,
     const base::Callback<void(bool)>& callback) {
   if (is_busy_) return false;
 
   is_canceled_ = false;
   scheduler_callback_ = callback;
   // TODO(petewil): Check existing conditions (should be passed down from
   // BackgroundTask)
 
   TryNextRequest();
 
   return true;
 }
 
 void RequestCoordinator::TryNextRequest() {
   // Choose a request to process that meets the available conditions.
   // This is an async call, and returns right away.
   picker_->ChooseNextRequest(
       base::Bind(&RequestCoordinator::RequestPicked,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&RequestCoordinator::RequestQueueEmpty,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
-void RequestCoordinator::StopProcessing() {
-  is_canceled_ = true;
-  if (offliner_ && is_busy_)
-    offliner_->Cancel();
+// Called by the request picker when a request has been picked.
+void RequestCoordinator::RequestPicked(const SavePageRequest& request) {
+  // Send the request on to the offliner.
+  SendRequestToOffliner(request);
 }
 
-Scheduler::TriggerConditions const&
-RequestCoordinator::GetTriggerConditionsForUserRequest() {
-  return kUserRequestTriggerConditions;
+void RequestCoordinator::RequestQueueEmpty() {
+  // Clear the outstanding "safety" task in the scheduler.
+  scheduler_->Unschedule();
+  // Return control to the scheduler when there is no more to do.
+  scheduler_callback_.Run(true);
 }
 
 void RequestCoordinator::SendRequestToOffliner(const SavePageRequest& request) {
   // Check that offlining didn't get cancelled while performing some async
   // steps.
   if (is_canceled_)
     return;
 
   GetOffliner();
   if (!offliner_) {
@@ skipping 27 matching lines @@
                           base::Bind(&RequestCoordinator::UpdateRequestCallback,
                                      weak_ptr_factory_.GetWeakPtr()));
 
     // TODO(petewil): Check time budget. Return to the scheduler if we are out.
 
     // Start another request if we have time.
     TryNextRequest();
   }
 }
 
+Scheduler::TriggerConditions const&

[fgorski, 2016/06/24 18:39:17]

Could you also update the order here to const type& and in the header. I think
we both missed it in original review.

+RequestCoordinator::GetTriggerConditionsForUserRequest() {
+  return kUserRequestTriggerConditions;
+}
+
 void RequestCoordinator::GetOffliner() {
     if (!offliner_) {
       offliner_ = factory_->GetOffliner(policy_.get());
     }
 }
 
 }  // namespace offline_pages