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

components/safe_browsing_db/v4_update_protocol_manager_unittest.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/safe_browsing_db/v4_update_protocol_manager.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 27 matching lines @@
 class V4UpdateProtocolManagerTest : public PlatformTest {
   void SetUp() override {
     PlatformTest::SetUp();
 
     SetupStoreStates();
   }
 
  protected:
   void ValidateGetUpdatesResults(
       const std::vector<ListUpdateResponse>& expected_lurs,
-      const std::vector<ListUpdateResponse>& list_update_responses) {
+      std::unique_ptr<ParsedServerResponse> parsed_server_response) {
     // The callback should never be called if expect_callback_to_be_called_ is
     // false.
     EXPECT_TRUE(expect_callback_to_be_called_);
-    ASSERT_EQ(expected_lurs.size(), list_update_responses.size());
+    ASSERT_EQ(expected_lurs.size(), parsed_server_response->size());
 
-    for (unsigned int i = 0; i < list_update_responses.size(); ++i) {
+    for (unsigned int i = 0; i < parsed_server_response->size(); ++i) {
       const ListUpdateResponse& expected = expected_lurs[i];
-      const ListUpdateResponse& actual = list_update_responses[i];
-
-      EXPECT_EQ(expected.platform_type(), actual.platform_type());
-      EXPECT_EQ(expected.response_type(), actual.response_type());
-      EXPECT_EQ(expected.threat_entry_type(), actual.threat_entry_type());
-      EXPECT_EQ(expected.threat_type(), actual.threat_type());
-      EXPECT_EQ(expected.new_client_state(), actual.new_client_state());
+      std::unique_ptr<ListUpdateResponse>& actual =

[Scott Hess - ex-Googler, 2016/06/28 03:58:43]

const should still be appropriate for a reference.  The change _allows_
destructively rearranging the overall response, it doesn't require it.

[vakh (use Gerrit instead), 2016/06/28 21:34:14]

Done.

+          (*parsed_server_response)[i];
+      EXPECT_EQ(expected.platform_type(), actual->platform_type());
+      EXPECT_EQ(expected.response_type(), actual->response_type());
+      EXPECT_EQ(expected.threat_entry_type(), actual->threat_entry_type());
+      EXPECT_EQ(expected.threat_type(), actual->threat_type());
+      EXPECT_EQ(expected.new_client_state(), actual->new_client_state());
 
       // TODO(vakh): Test more fields from the proto.
     }
   }
 
   std::unique_ptr<V4UpdateProtocolManager> CreateProtocolManager(
       const std::vector<ListUpdateResponse>& expected_lurs) {
     V4ProtocolConfig config;
     config.client_name = kClient;
     config.version = kAppVer;
@@ skipping 219 matching lines @@
   fetcher->SetResponseString(GetExpectedV4UpdateResponse(expected_lurs));
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   // No error, back off multiplier is unchanged.
   EXPECT_EQ(0ul, pm->update_error_count_);
   EXPECT_EQ(1ul, pm->update_back_off_mult_);
   EXPECT_FALSE(pm->IsUpdateScheduled());
 }
 
 }  // namespace safe_browsing