[Offline pages] Removing active_request_ from request coordinator

components/offline_pages/core/background/offliner.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_CORE_BACKGROUND_OFFLINER_H_
 #define COMPONENTS_OFFLINE_PAGES_CORE_BACKGROUND_OFFLINER_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 47 matching lines @@
     // We saved a snapshot on the last retry, after timeout.
     SAVED_ON_LAST_RETRY = 15,
     // NOTE: insert new values above this line and update histogram enum too.
     STATUS_COUNT
   };
 
   // Reports the load progress of a request.
   typedef base::Callback<void(const SavePageRequest&, int64_t received_bytes)>
       ProgressCallback;
   // Reports the completion status of a request.
-  // TODO(dougarnett): consider passing back a request id instead of request.
   typedef base::Callback<void(const SavePageRequest&, RequestStatus)>
       CompletionCallback;
   // Reports that the cancel operation has completed.
   // TODO(chili): make save operation cancellable.
-  typedef base::Callback<void(int64_t request_id)> CancelCallback;
+  typedef base::Callback<void(const SavePageRequest&)> CancelCallback;
 
   Offliner() {}
   virtual ~Offliner() {}
 
   // Processes |request| to load and save an offline page.
   // Returns whether the request was accepted or not. |completion_callback| is
   // guaranteed to be called if the request was accepted and |Cancel()| is not
   // called on it. |progress_callback| is invoked periodically to report the
   // number of bytes received from the network (for UI purposes).
   virtual bool LoadAndSave(const SavePageRequest& request,
                            const CompletionCallback& completion_callback,
                            const ProgressCallback& progress_callback) = 0;
 
   // Clears the currently processing request, if any, and skips running its
-  // CompletionCallback.
-  virtual void Cancel(const CancelCallback& callback) = 0;
+  // CompletionCallback. Returns false if there is nothing to cancel, otherwise
+  // returns true and canceled request will be delivered using callback.
+  virtual bool Cancel(const CancelCallback& callback) = 0;
 
   // Handles timeout scenario. Returns true if lowbar is met and try to do a
-  // snapshot of the current webcontents.
-  virtual bool HandleTimeout(const SavePageRequest& request) = 0;
+  // snapshot of the current webcontents. If that is the case, the result of
+  // offlining will be provided by |completion_callback|.
+  virtual bool HandleTimeout(int64_t request_id) = 0;
 
   // TODO(dougarnett): add policy support methods.
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_CORE_BACKGROUND_OFFLINER_H_