Add support for scout to 'ext' param when creating SafeBrowsing ping URLs.

chrome/browser/safe_browsing/protocol_manager_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/safe_browsing/protocol_manager.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/safe_browsing/chunk.pb.h"
+#include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/safe_browsing_db/safebrowsing.pb.h"
 #include "components/safe_browsing_db/util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gmock_mutant.h"
@@ skipping 243 matching lines @@
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestGetHashUrl) {
   std::unique_ptr<SafeBrowsingProtocolManager> pm(
       CreateProtocolManager(nullptr));
 
   EXPECT_EQ(
       "https://prefix.com/foo/gethash?client=unittest&appver=1.0&"
       "pver=3.0" +
           key_param_ + "&ext=0",
-      pm->GetHashUrl(false).spec());
+      pm->GetHashUrl(SBER_LEVEL_OFF).spec());
 
   pm->set_additional_query(kAdditionalQuery);
   EXPECT_EQ(
       "https://prefix.com/foo/gethash?client=unittest&appver=1.0&"
       "pver=3.0" +
           key_param_ + "&additional_query&ext=1",
-      pm->GetHashUrl(true).spec());
+      pm->GetHashUrl(SBER_LEVEL_LEGACY).spec());
+
+  EXPECT_EQ(
+      "https://prefix.com/foo/gethash?client=unittest&appver=1.0&"
+      "pver=3.0" +
+          key_param_ + "&additional_query&ext=2",
+      pm->GetHashUrl(SBER_LEVEL_SCOUT).spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestUpdateUrl) {
   std::unique_ptr<SafeBrowsingProtocolManager> pm(
       CreateProtocolManager(nullptr));
 
   EXPECT_EQ(
       "https://prefix.com/foo/downloads?client=unittest&appver=1.0&"
       "pver=3.0" +
           key_param_ + "&ext=1",
-      pm->UpdateUrl(true).spec());
+      pm->UpdateUrl(SBER_LEVEL_LEGACY).spec());
+
+  EXPECT_EQ(
+      "https://prefix.com/foo/downloads?client=unittest&appver=1.0&"
+      "pver=3.0" +
+          key_param_ + "&ext=2",
+      pm->UpdateUrl(SBER_LEVEL_SCOUT).spec());
 
   pm->set_additional_query(kAdditionalQuery);
   EXPECT_EQ(
       "https://prefix.com/foo/downloads?client=unittest&appver=1.0&"
       "pver=3.0" +
           key_param_ + "&additional_query&ext=0",
-      pm->UpdateUrl(false).spec());
+      pm->UpdateUrl(SBER_LEVEL_OFF).spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestNextChunkUrl) {
   std::unique_ptr<SafeBrowsingProtocolManager> pm(
       CreateProtocolManager(nullptr));
 
   std::string url_partial = "localhost:1234/foo/bar?foo";
   std::string url_http_full = "http://localhost:1234/foo/bar?foo";
   std::string url_https_full = "https://localhost:1234/foo/bar?foo";
   std::string url_https_no_query = "https://localhost:1234/foo/bar";
@@ skipping 54 matching lines @@
   }
 };
 
 // |InvokeGetChunksCallback| is required because GMock's InvokeArgument action
 // expects to use operator(), and a Callback only provides Run().
 // TODO(cbentzel): Use ACTION or ACTION_TEMPLATE instead?
 void InvokeGetChunksCallback(
     const std::vector<SBListChunkRanges>& ranges,
     bool database_error,
     SafeBrowsingProtocolManagerDelegate::GetChunksCallback callback) {
-  callback.Run(ranges, database_error, false);
+  callback.Run(ranges, database_error, SBER_LEVEL_OFF);
 }
 
 // |HandleAddChunks| deletes the chunks and asynchronously invokes
 // |callback| since SafeBrowsingProtocolManager is not re-entrant at the time
 // this is called. This guarantee is part of the
 // SafeBrowsingProtocolManagerDelegate contract.
 void HandleAddChunks(
     const std::string& unused_list,
     const std::vector<std::unique_ptr<SBChunkData>>& chunks,
     SafeBrowsingProtocolManagerDelegate::AddChunksCallback callback) {
@@ skipping 709 matching lines @@
 
   EXPECT_FALSE(pm->IsUpdateScheduled());
 
   // Invoke the AddChunksCallback to finish the update.
   runner_->RunPendingTasks();
 
   EXPECT_TRUE(pm->IsUpdateScheduled());
 }
 
 }  // namespace safe_browsing