Rename RequestCoordinator::queue() -> queue_for_testing()

Change-Id: I586fbd98fbf5529d7144513f75fa470d1accd0e8
Reviewed-on: https://chromium-review.googlesource.com/1236462Reviewed-by: Cathy Li <chili@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Commit-Queue: Dan H <harringtond@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593571}

chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc

@@ -183,26 +183,21 @@ void OfflineInternalsUIMessageHandler::HandleStoredPagesCallback(
 
 void OfflineInternalsUIMessageHandler::HandleRequestQueueCallback(
     std::string callback_id,
-    offline_pages::GetRequestsResult result,
     std::vector<std::unique_ptr<offline_pages::SavePageRequest>> requests) {
   base::ListValue save_page_requests;
-  if (result == offline_pages::GetRequestsResult::SUCCESS) {
-    for (const auto& request : requests) {
-      auto save_page_request = std::make_unique<base::DictionaryValue>();
-      save_page_request->SetString("onlineUrl", request->url().spec());
-      save_page_request->SetDouble("creationTime",
-                                   request->creation_time().ToJsTime());
-      save_page_request->SetString("status", GetStringFromSavePageStatus());
-      save_page_request->SetString("namespace",
-                                   request->client_id().name_space);
-      save_page_request->SetDouble("lastAttemptTime",
-                                   request->last_attempt_time().ToJsTime());
-      save_page_request->SetString("id", std::to_string(request->request_id()));
-      save_page_request->SetString("originalUrl",
-                                   request->original_url().spec());
-      save_page_request->SetString("requestOrigin", request->request_origin());
-      save_page_requests.Append(std::move(save_page_request));
-    }
+  for (const auto& request : requests) {
+    auto save_page_request = std::make_unique<base::DictionaryValue>();
+    save_page_request->SetString("onlineUrl", request->url().spec());
+    save_page_request->SetDouble("creationTime",
+                                 request->creation_time().ToJsTime());
+    save_page_request->SetString("status", GetStringFromSavePageStatus());
+    save_page_request->SetString("namespace", request->client_id().name_space);
+    save_page_request->SetDouble("lastAttemptTime",
+                                 request->last_attempt_time().ToJsTime());
+    save_page_request->SetString("id", std::to_string(request->request_id()));
+    save_page_request->SetString("originalUrl", request->original_url().spec());
+    save_page_request->SetString("requestOrigin", request->request_origin());
+    save_page_requests.Append(std::move(save_page_request));
   }
   ResolveJavascriptCallback(base::Value(callback_id), save_page_requests);
 }
@@ -214,7 +209,7 @@ void OfflineInternalsUIMessageHandler::HandleGetRequestQueue(
   CHECK(args->GetString(0, &callback_id));
 
   if (request_coordinator_) {
-    request_coordinator_->queue()->GetRequests(base::Bind(
+    request_coordinator_->GetAllRequests(base::BindOnce(
         &OfflineInternalsUIMessageHandler::HandleRequestQueueCallback,
         weak_ptr_factory_.GetWeakPtr(), callback_id));
   } else {

chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.h

@@ -95,7 +95,6 @@ class OfflineInternalsUIMessageHandler : public content::WebUIMessageHandler {
   // Callback for async GetRequests calls.
   void HandleRequestQueueCallback(
       std::string callback_id,
-      offline_pages::GetRequestsResult result,
       std::vector<std::unique_ptr<offline_pages::SavePageRequest>> requests);
 
   // Callback for DeletePage/DeleteAllPages calls.

components/offline_pages/core/background/request_coordinator.h

@@ -218,7 +218,7 @@ class RequestCoordinator : public KeyedService,
                              int64_t received_bytes) override;
 
   // Returns the request queue used for requests.  Coordinator keeps ownership.
-  RequestQueue* queue() { return queue_.get(); }
+  RequestQueue* queue_for_testing() { return queue_.get(); }
 
   // Return an unowned pointer to the Scheduler.
   Scheduler* scheduler() { return scheduler_.get(); }