[Offline pages] Applying TaskQueue to RequestQueue::ChangeRequestsState

components/offline_pages/background/request_queue_store_sql.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_queue_store_sql.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 117 matching lines @@
   sql::Statement statement(db->GetCachedStatement(SQL_FROM_HERE, kSql));
   statement.BindInt64(0, request_id);
   if (!statement.Run())
     return RequestQueue::UpdateRequestResult::STORE_FAILURE;
   else if (db->GetLastChangeCount() == 0)
     return RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
   else
     return RequestQueue::UpdateRequestResult::SUCCESS;
 }
 
-bool ChangeRequestState(sql::Connection* db,
-                        const int64_t request_id,
-                        const SavePageRequest::RequestState new_state) {
-  const char kSql[] = "UPDATE " REQUEST_QUEUE_TABLE_NAME
-                      " SET state=?"
-                      " WHERE request_id=?";
-  sql::Statement statement(db->GetCachedStatement(SQL_FROM_HERE, kSql));
-  statement.BindInt64(0, static_cast<int64_t>(new_state));
-  statement.BindInt64(1, request_id);
-  return statement.Run();
-}
-
 // Helper function to delete requests corresponding to passed in requestIds,
 // and fill an outparam with the removed requests.
 bool DeleteRequestsByIds(
     sql::Connection* db,
     const std::vector<int64_t>& request_ids,
     RequestQueue::UpdateMultipleRequestResults& results,
     std::vector<std::unique_ptr<SavePageRequest>>* requests) {
   // If you create a transaction but don't Commit() it is automatically
   // rolled back by its destructor when it falls out of scope.
   sql::Transaction transaction(db);
@@ skipping 15 matching lines @@
 
   if (!transaction.Commit()) {
     requests->clear();
     BuildFailedResultList(request_ids, results);
     return false;
   }
 
   return true;
 }
 
-bool ChangeRequestsState(
-    sql::Connection* db,
-    const std::vector<int64_t>& request_ids,
-    SavePageRequest::RequestState new_state,
-    RequestQueue::UpdateMultipleRequestResults& results,
-    std::vector<std::unique_ptr<SavePageRequest>>& requests) {
-  // If you create a transaction but don't Commit() it is automatically
-  // rolled back by its destructor when it falls out of scope.
-  sql::Transaction transaction(db);
-  if (!transaction.Begin()) {
-    BuildFailedResultList(request_ids, results);
-    return false;
-  }
-
-  // Update a request, then get it, and put the item we got on the output list.
-  for (const auto& request_id : request_ids) {
-    RequestQueue::UpdateRequestResult status;
-    if (!ChangeRequestState(db, request_id, new_state))
-      status = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
-    else
-      status = RequestQueue::UpdateRequestResult::SUCCESS;
-
-    // Make output request_id/status pair, and put a copy of the updated request
-    // on output list.
-    results.push_back(std::make_pair(request_id, status));
-    requests.push_back(GetOneRequest(db, request_id));
-  }
-
-  if (!transaction.Commit()) {
-    requests.clear();
-    BuildFailedResultList(request_ids, results);
-    return false;
-  }
-
-  return true;
-}
-
 ItemActionStatus Insert(sql::Connection* db, const SavePageRequest& request) {
   const char kSql[] =
       "INSERT OR IGNORE INTO " REQUEST_QUEUE_TABLE_NAME
       " (request_id, creation_time, activation_time,"
       " last_attempt_time, started_attempt_count, completed_attempt_count,"
       " state, url, client_namespace, client_id)"
       " VALUES "
       " (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
   sql::Statement statement(db->GetCachedStatement(SQL_FROM_HERE, kSql));
@@ skipping 145 matching lines @@
                         const std::vector<int64_t>& request_ids,
                         const RequestQueueStore::RemoveCallback& callback) {
   RequestQueue::UpdateMultipleRequestResults results;
   std::vector<std::unique_ptr<SavePageRequest>> requests;
   // TODO(fgorski): add UMA metrics here.
   DeleteRequestsByIds(db, request_ids, results, &requests);
   runner->PostTask(FROM_HERE,
                    base::Bind(callback, results, base::Passed(&requests)));
 }
 
-void ChangeRequestsStateSync(
-    sql::Connection* db,
-    scoped_refptr<base::SingleThreadTaskRunner> runner,
-    const std::vector<int64_t>& request_ids,
-    const SavePageRequest::RequestState new_state,
-    const RequestQueue::UpdateMultipleRequestsCallback& callback) {
-  RequestQueue::UpdateMultipleRequestResults results;
-  std::vector<std::unique_ptr<SavePageRequest>> requests;
-  // TODO(fgorski): add UMA metrics here.
-  offline_pages::ChangeRequestsState(db, request_ids, new_state, results,
-                                     requests);
-  runner->PostTask(FROM_HERE,
-                   base::Bind(callback, results, base::Passed(&requests)));
-}
-
 void OpenConnectionSync(sql::Connection* db,
                         scoped_refptr<base::SingleThreadTaskRunner> runner,
                         const base::FilePath& path,
                         const base::Callback<void(bool)>& callback) {
   bool success = InitDatabase(db, path);
   runner->PostTask(FROM_HERE, base::Bind(callback, success));
 }
 
 void ResetSync(sql::Connection* db,
                const base::FilePath& db_file_path,
@@ skipping 86 matching lines @@
           base::Passed(std::vector<std::unique_ptr<SavePageRequest>>())))) {
     return;
   }
 
   background_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RemoveRequestsSync, db_.get(),
                  base::ThreadTaskRunnerHandle::Get(), request_ids, callback));
 }
 
-void RequestQueueStoreSQL::ChangeRequestsState(
-    const std::vector<int64_t>& request_ids,
-    const SavePageRequest::RequestState new_state,
-    const UpdateMultipleRequestsCallback& callback) {
-  RequestQueue::UpdateMultipleRequestResults results;
-  std::vector<std::unique_ptr<SavePageRequest>> requests;
-  if (!CheckDb(base::Bind(callback, results, base::Passed(&requests)))) {
-    return;
-  }
-
-  background_task_runner_->PostTask(
-      FROM_HERE, base::Bind(&ChangeRequestsStateSync, db_.get(),
-                            base::ThreadTaskRunnerHandle::Get(), request_ids,
-                            new_state, callback));
-}
-
 void RequestQueueStoreSQL::Reset(const ResetCallback& callback) {
   DCHECK(db_.get());
   if (!CheckDb(base::Bind(callback, false)))
     return;
 
   background_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ResetSync, db_.get(), db_file_path_,
                  base::ThreadTaskRunnerHandle::Get(),
                  base::Bind(&RequestQueueStoreSQL::OnResetDone,
@@ skipping 20 matching lines @@
 }
 
 void RequestQueueStoreSQL::OnResetDone(const ResetCallback& callback,
                                        bool success) {
   // Complete connection initialization post reset.
   OnOpenConnectionDone(success);
   callback.Run(success);
 }
 
 }  // namespace offline_pages