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

components/safe_browsing_db/v4_update_protocol_manager_unittest.cc

Index: components/safe_browsing_db/v4_update_protocol_manager_unittest.cc
diff --git a/components/safe_browsing_db/v4_update_protocol_manager_unittest.cc b/components/safe_browsing_db/v4_update_protocol_manager_unittest.cc
index f380e55f903d35d6d5b3c8d3d71b6a257fad0f27..b82986d8c094dcfc8d2a1e0999e17332fec53d89 100644
--- a/components/safe_browsing_db/v4_update_protocol_manager_unittest.cc
+++ b/components/safe_browsing_db/v4_update_protocol_manager_unittest.cc
@@ -45,21 +45,21 @@ class V4UpdateProtocolManagerTest : public PlatformTest {
  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.
     }