Add a browser test for the billing interstitial.

Bug: 867518

R: jialiul
Change-Id: Ie6cd84e046f00f384c966e8dd6182cee41541c80
Reviewed-on: https://chromium-review.googlesource.com/1249817Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594884}

chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc

@@ -72,6 +72,7 @@
 #include "components/safe_browsing/db/v4_get_hash_protocol_manager.h"
 #include "components/safe_browsing/db/v4_protocol_manager_util.h"
 #include "components/safe_browsing/db/v4_test_util.h"
+#include "components/safe_browsing/features.h"
 #include "components/security_interstitials/core/controller_client.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -133,6 +134,7 @@ const char kMalwareJsRequestPage[] = "/safe_browsing/malware_js_request.html";
 const char kMalwareWebSocketPath[] = "/safe_browsing/malware-ws";
 const char kNeverCompletesPath[] = "/never_completes";
 const char kPrefetchMalwarePage[] = "/safe_browsing/prefetch_malware.html";
+const char kBillingInterstitialPage[] = "/safe_browsing/billing.html";
 
 // TODO(ricea): Use net::test_server::HungResponse instead.
 class NeverCompletingHttpResponse : public net::test_server::HttpResponse {
@@ -387,15 +389,20 @@ class TestSBClient : public base::RefCountedThreadSafe<TestSBClient>,
   }
 
   void CheckBrowseUrlOnIOThread(const GURL& url) {
+    SBThreatTypeSet threat_types = CreateSBThreatTypeSet(
+        {SB_THREAT_TYPE_URL_PHISHING, SB_THREAT_TYPE_URL_MALWARE,
+         SB_THREAT_TYPE_URL_UNWANTED});
+    if (base::FeatureList::IsEnabled(kBillingInterstitial)) {
+      SBThreatTypeSet billing =
+          CreateSBThreatTypeSet({safe_browsing::SB_THREAT_TYPE_BILLING});
+      threat_types.insert(billing.begin(), billing.end());
+    }
+
     // The async CheckDone() hook will not be called when we have a synchronous
     // safe signal, handle it right away.
     bool synchronous_safe_signal =
         safe_browsing_service_->database_manager()->CheckBrowseUrl(
-            url,
-            CreateSBThreatTypeSet({SB_THREAT_TYPE_URL_PHISHING,
-                                   SB_THREAT_TYPE_URL_MALWARE,
-                                   SB_THREAT_TYPE_URL_UNWANTED}),
-            this);
+            url, threat_types, this);
     if (synchronous_safe_signal) {
       threat_type_ = SB_THREAT_TYPE_SAFE;
       base::PostTaskWithTraits(FROM_HERE, {BrowserThread::UI},
@@ -533,6 +540,13 @@ class V4SafeBrowsingServiceTest : public InProcessBrowserTest {
                               ThreatPatternType::NONE);
   }
 
+  // Sets up the prefix database and the full hash cache to match one of the
+  // prefixes for the given URL in the Billing store.
+  void MarkUrlForBillingUnexpired(const GURL& bad_url) {
+    MarkUrlForListIdUnexpired(bad_url, GetUrlBillingId(),
+                              ThreatPatternType::NONE);
+  }
+
   void SetUpCommandLine(base::CommandLine* command_line) override {
 #if defined(OS_CHROMEOS)
     command_line->AppendSwitch(
@@ -994,6 +1008,32 @@ IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest, CheckBrowseUrl) {
   }
 }
 
+IN_PROC_BROWSER_TEST_F(V4SafeBrowsingServiceTest, CheckBrowseUrlForBilling) {
+  const GURL bad_url = embedded_test_server()->GetURL(kBillingInterstitialPage);
+  {
+    scoped_refptr<TestSBClient> client(new TestSBClient);
+
+    // Since the feature isn't enabled and the URL isn't in the database, it is
+    // considered to be safe.
+    client->CheckBrowseUrl(bad_url);
+    EXPECT_EQ(SB_THREAT_TYPE_SAFE, client->GetThreatType());
+
+    base::test::ScopedFeatureList feature_list;
+    feature_list.InitAndEnableFeature(kBillingInterstitial);
+
+    // Since bad_url is not in database, it is considered to be
+    // safe.
+    client->CheckBrowseUrl(bad_url);
+    EXPECT_EQ(SB_THREAT_TYPE_SAFE, client->GetThreatType());
+
+    MarkUrlForBillingUnexpired(bad_url);
+
+    // Now, the bad_url is not safe since it is added to the database.
+    client->CheckBrowseUrl(bad_url);
+    EXPECT_EQ(SB_THREAT_TYPE_BILLING, client->GetThreatType());
+  }
+}
+
 // Parameterised fixture to permit running the same test for Window and Worker
 // scopes.
 class V4SafeBrowsingServiceJsRequestTest