Replace the old URL format for PVer4 requests with the new format.

components/safe_browsing_db/v4_protocol_manager_util_unittest.cc

Index: components/safe_browsing_db/v4_protocol_manager_util_unittest.cc
diff --git a/components/safe_browsing_db/v4_protocol_manager_util_unittest.cc b/components/safe_browsing_db/v4_protocol_manager_util_unittest.cc
index 0a997b645ae84f0c5ac3cf6a80704553cec9cabc..f118c7f59500fa01708048ecede3c9537bbbab35 100644
--- a/components/safe_browsing_db/v4_protocol_manager_util_unittest.cc
+++ b/components/safe_browsing_db/v4_protocol_manager_util_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/base64.h"
 #include "base/time/time.h"
 #include "net/base/escape.h"
+#include "net/http/http_request_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
@@ -45,78 +46,84 @@ TEST_F(SafeBrowsingV4ProtocolManagerUtilTest, TestBackOffLogic) {
   EXPECT_GE(TimeDelta::FromMinutes(30), next);
 
   // 2 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(2U, error_count);
   EXPECT_EQ(2U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(30), next);
   EXPECT_GE(TimeDelta::FromMinutes(60), next);
 
   // 3 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(3U, error_count);
   EXPECT_EQ(4U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(60), next);
   EXPECT_GE(TimeDelta::FromMinutes(120), next);
 
   // 4 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(4U, error_count);
   EXPECT_EQ(8U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(120), next);
   EXPECT_GE(TimeDelta::FromMinutes(240), next);
 
   // 5 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(5U, error_count);
   EXPECT_EQ(16U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(240), next);
   EXPECT_GE(TimeDelta::FromMinutes(480), next);
 
   // 6 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(6U, error_count);
   EXPECT_EQ(32U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(480), next);
   EXPECT_GE(TimeDelta::FromMinutes(960), next);
 
   // 7 errors.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(7U, error_count);
   EXPECT_EQ(64U, back_off_multiplier);
   EXPECT_LE(TimeDelta::FromMinutes(960), next);
   EXPECT_GE(TimeDelta::FromMinutes(1920), next);
 
   // 8 errors, reached max backoff.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(8U, error_count);
   EXPECT_EQ(128U, back_off_multiplier);
   EXPECT_EQ(TimeDelta::FromHours(24), next);
 
   // 9 errors, reached max backoff and multiplier capped.
-  next = V4ProtocolManagerUtil::GetNextBackOffInterval(
-      &error_count, &back_off_multiplier);
+  next = V4ProtocolManagerUtil::GetNextBackOffInterval(&error_count,
+                                                       &back_off_multiplier);
   EXPECT_EQ(9U, error_count);
   EXPECT_EQ(128U, back_off_multiplier);
   EXPECT_EQ(TimeDelta::FromHours(24), next);
 }
 
-TEST_F(SafeBrowsingV4ProtocolManagerUtilTest, TestGetRequestUrl) {
+TEST_F(SafeBrowsingV4ProtocolManagerUtilTest,
+       TestGetRequestUrlAndUpdateHeaders) {
   V4ProtocolConfig config;
   PopulateV4ProtocolConfig(&config);
 
+  net::HttpRequestHeaders headers;
+  GURL gurl;
+  V4ProtocolManagerUtil::GetRequestUrlAndHeaders("request_base64", "someMethod",
+                                                 config, &gurl, &headers);
   std::string expectedUrl =
-      "https://safebrowsing.googleapis.com/v4/someMethod/request_base64?"
-      "alt=proto&client_id=unittest&client_version=1.0&key=test_key_param";
-  EXPECT_EQ(expectedUrl, V4ProtocolManagerUtil::GetRequestUrl(
-                             "request_base64", "someMethod", config)
-                             .spec());
+      "https://safebrowsing.googleapis.com/v4/someMethod?"
+      "$req=request_base64&$ct=application/x-protobuf&key=test_key_param";
+  EXPECT_EQ(expectedUrl, gurl.spec());
+  std::string header_value;
+  EXPECT_TRUE(headers.GetHeader("X-HTTP-Method-Override", &header_value));
+  EXPECT_EQ("POST", header_value);
 }
 
 }  // namespace safe_browsing