SafeBrowsing PVer4: Send mutable response to the database and the stores

components/safe_browsing_db/v4_database.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 <memory>
 
 #include "base/callback.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 74 matching lines @@
   V4Database* v4_database_raw = v4_database.release();
   if (v4_database_raw) {
     v4_database_raw->db_task_runner_->DeleteSoon(FROM_HERE, v4_database_raw);
   }
 }
 
 V4Database::~V4Database() {
   DCHECK(db_task_runner_->RunsTasksOnCurrentThread());
 }
 
-void V4Database::ApplyUpdate(const std::vector<ListUpdateResponse>& responses,
-                             DatabaseUpdatedCallback db_updated_callback) {
+void V4Database::ApplyUpdate(
+    std::unique_ptr<ParsedServerResponse> parsed_server_response,
+    DatabaseUpdatedCallback db_updated_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!pending_store_updates_);
   DCHECK(db_updated_callback_.is_null());
 
   db_updated_callback_ = db_updated_callback;
 
   // Post the V4Store update task on the task runner but get the callback on the
   // current thread.
   const scoped_refptr<base::SingleThreadTaskRunner>& current_task_runner =
       base::MessageLoop::current()->task_runner();
-  for (const ListUpdateResponse& response : responses) {
-    UpdateListIdentifier identifier(response);
+  for (std::unique_ptr<ListUpdateResponse>& response :
+       *parsed_server_response) {
+    UpdateListIdentifier identifier(*response);
     StoreMap::const_iterator iter = store_map_->find(identifier);
     if (iter != store_map_->end()) {
       const std::unique_ptr<V4Store>& old_store = iter->second;
-      if (old_store->state() != response.new_client_state()) {
+      if (old_store->state() != response->new_client_state()) {
         // A different state implies there are updates to process.
         pending_store_updates_++;
         UpdatedStoreReadyCallback store_ready_callback = base::Bind(
             &V4Database::UpdatedStoreReady, base::Unretained(this), identifier);
         db_task_runner_->PostTask(
             FROM_HERE,
             base::Bind(&V4Store::ApplyUpdate, base::Unretained(old_store.get()),
-                       response, current_task_runner, store_ready_callback));
+                       base::Passed(std::move(response)), current_task_runner,
+                       store_ready_callback));
       }
     } else {
       NOTREACHED() << "Got update for unexpected identifier: " << identifier;
     }
   }
 
   if (!pending_store_updates_) {
     current_task_runner->PostTask(FROM_HERE, db_updated_callback_);
     db_updated_callback_.Reset();
   }
@@ skipping 26 matching lines @@
 std::unique_ptr<StoreStateMap> V4Database::GetStoreStateMap() {
   std::unique_ptr<StoreStateMap> store_state_map =
       base::MakeUnique<StoreStateMap>();
   for (const auto& store_map_iter : *store_map_) {
     (*store_state_map)[store_map_iter.first] = store_map_iter.second->state();
   }
   return store_state_map;
 }
 
 }  // namespace safe_browsing