Renamed Trick to Bill to Billing

Rename "Trick to Bill" in the code to "Billing".
This CL will change values such as:
- SB_THREAT_TYPE_TRICK_TO_BILL to SB_THREAT_TYPE_BILLING
- SB_REASON_TRICK_TO_BILL to SB_REASON_BILLING

Bug: 867518
Change-Id: I0f1b5f9bb8c21d10053de74001b5af0d493e4363
Reviewed-on: https://chromium-review.googlesource.com/1159228Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580698}

chrome/browser/interstitials/enterprise_util.cc

@@ -81,7 +81,7 @@ std::string GetThreatTypeStringForInterstitial(
     case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE:
       return "MALWARE";
     case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED:
-    case safe_browsing::SB_THREAT_TYPE_TRICK_TO_BILL:
+    case safe_browsing::SB_THREAT_TYPE_BILLING:
       return "HARMFUL";
     case safe_browsing::SB_THREAT_TYPE_UNUSED:
     case safe_browsing::SB_THREAT_TYPE_SAFE:

chrome/browser/safe_browsing/safe_browsing_blocking_page.h

@@ -97,7 +97,7 @@ class SafeBrowsingBlockingPage : public BaseBlockingPage {
                            ExtendedReportingNotShownInIncognito);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest,
                            ExtendedReportingNotShownNotAllowExtendedReporting);
-  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, TrickToBillPage);
+  FRIEND_TEST_ALL_PREFIXES(SafeBrowsingBlockingPageTest, BillingPage);
 
   void UpdateReportingPref();  // Used for the transition from old to new pref.
 

chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

@@ -949,14 +949,14 @@ TEST_F(SafeBrowsingBlockingPageTest,
   ui_manager_->GetThreatDetails()->clear();
 }
 
-// Tests showing a blocking page for trick-to-bill.
-TEST_F(SafeBrowsingBlockingPageTest, TrickToBillPage) {
+// Tests showing a blocking page for billing.
+TEST_F(SafeBrowsingBlockingPageTest, BillingPage) {
   // Start a load.
   controller().LoadURL(GURL(kBadURL), content::Referrer(),
                        ui::PAGE_TRANSITION_TYPED, std::string());
 
   // Simulate the load causing a safe browsing interstitial to be shown.
-  ShowInterstitial(false, kBadURL, SB_THREAT_TYPE_TRICK_TO_BILL);
+  ShowInterstitial(false, kBadURL, SB_THREAT_TYPE_BILLING);
 
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
@@ -967,14 +967,13 @@ TEST_F(SafeBrowsingBlockingPageTest, TrickToBillPage) {
   base::string16 str;
 
   load_time_data.GetString("heading", &str);
-  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_HEADING));
+  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_BILLING_HEADING));
   load_time_data.GetString("primaryParagraph", &str);
-  EXPECT_EQ(str,
-            l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PRIMARY_PARAGRAPH));
+  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_BILLING_PRIMARY_PARAGRAPH));
   load_time_data.GetString("primaryButtonText", &str);
-  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PRIMARY_BUTTON));
+  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_BILLING_PRIMARY_BUTTON));
   load_time_data.GetString("proceedButtonText", &str);
-  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PROCEED_BUTTON));
+  EXPECT_EQ(str, l10n_util::GetStringUTF16(IDS_BILLING_PROCEED_BUTTON));
 
   load_time_data.GetString("openDetails", &str);
   EXPECT_EQ(str, base::string16());
@@ -986,7 +985,7 @@ TEST_F(SafeBrowsingBlockingPageTest, TrickToBillPage) {
   EXPECT_EQ(str, base::string16());
 
   bool flag;
-  load_time_data.GetBoolean("trick_to_bill", &flag);
+  load_time_data.GetBoolean("billing", &flag);
   EXPECT_TRUE(flag);
   load_time_data.GetBoolean("phishing", &flag);
   EXPECT_FALSE(flag);

chrome/browser/ssl/security_state_tab_helper.cc

@@ -284,9 +284,9 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
     switch (threat_type) {
       case safe_browsing::SB_THREAT_TYPE_UNUSED:
       case safe_browsing::SB_THREAT_TYPE_SAFE:
-      // TODO(https://crbug.com/867518): Create a malicious trick to bill enum
-      // and return it.
-      case safe_browsing::SB_THREAT_TYPE_TRICK_TO_BILL:
+      // TODO(https://crbug.com/867518): Create a malicious billing enum and
+      // return it.
+      case safe_browsing::SB_THREAT_TYPE_BILLING:
         break;
       case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
       case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:

chrome/browser/ui/webui/interstitials/interstitial_ui.cc

@@ -280,8 +280,8 @@ safe_browsing::SafeBrowsingBlockingPage* CreateSafeBrowsingBlockingPage(
       threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
     } else if (type_param == "clientside_phishing") {
       threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
-    } else if (type_param == "trick_to_bill") {
-      threat_type = safe_browsing::SB_THREAT_TYPE_TRICK_TO_BILL;
+    } else if (type_param == "billing") {
+      threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
     }
   }
   safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;

chrome/browser/ui/webui/interstitials/interstitial_ui_browsertest.cc

@@ -125,9 +125,8 @@ IN_PROC_BROWSER_TEST_F(InterstitialUITest, ClientsidePhishingInterstitial) {
       "Security error");
 }
 
-IN_PROC_BROWSER_TEST_F(InterstitialUITest, TrickToBillInterstitial) {
-  TestInterstitial(
-      GURL("chrome://interstitials/safebrowsing?type=trick_to_bill"),
+IN_PROC_BROWSER_TEST_F(InterstitialUITest, BillingInterstitial) {
+  TestInterstitial(GURL("chrome://interstitials/safebrowsing?type=billing"),
                    "Security error");
 }
 

components/safe_browsing/base_blocking_page.cc

@@ -239,9 +239,8 @@ std::string BaseBlockingPage::GetMetricPrefix(
       return primary_subresource ? "malware_subresource" : "malware";
     case BaseSafeBrowsingErrorUI::SB_REASON_HARMFUL:
       return primary_subresource ? "harmful_subresource" : "harmful";
-    case BaseSafeBrowsingErrorUI::SB_REASON_TRICK_TO_BILL:
-      return primary_subresource ? "trick_to_bill_subresource"
-                                 : "trick_to_bill";
+    case BaseSafeBrowsingErrorUI::SB_REASON_BILLING:
+      return primary_subresource ? "billing_subresource" : "billing";
     case BaseSafeBrowsingErrorUI::SB_REASON_PHISHING:
       ThreatPatternType threat_pattern_type =
           unsafe_resources[0].threat_metadata.threat_pattern_type;
@@ -294,8 +293,8 @@ BaseBlockingPage::GetInterstitialReason(
        iter != unsafe_resources.end(); ++iter) {
     const BaseUIManager::UnsafeResource& resource = *iter;
     safe_browsing::SBThreatType threat_type = resource.threat_type;
-    if (threat_type == SB_THREAT_TYPE_TRICK_TO_BILL)
-      return BaseSafeBrowsingErrorUI::SB_REASON_TRICK_TO_BILL;
+    if (threat_type == SB_THREAT_TYPE_BILLING)
+      return BaseSafeBrowsingErrorUI::SB_REASON_BILLING;
 
     if (threat_type == SB_THREAT_TYPE_URL_MALWARE ||
         threat_type == SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE) {

components/safe_browsing/db/v4_protocol_manager_util.h

@@ -142,7 +142,7 @@ enum SBThreatType {
   SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE,
 
   // Deceptive mobile billing practice detected.
-  SB_THREAT_TYPE_TRICK_TO_BILL,
+  SB_THREAT_TYPE_BILLING,
 };
 
 using SBThreatTypeSet = base::flat_set<SBThreatType>;

components/security_interstitials/core/base_safe_browsing_error_ui.h

@@ -23,7 +23,7 @@ class BaseSafeBrowsingErrorUI {
     SB_REASON_MALWARE,
     SB_REASON_HARMFUL,
     SB_REASON_PHISHING,
-    SB_REASON_TRICK_TO_BILL,
+    SB_REASON_BILLING,
   };
 
   struct SBErrorDisplayOptions {

components/security_interstitials/core/browser/resources/extended_reporting.js

@@ -26,11 +26,11 @@ function setupExtendedReportingCheckbox() {
   $('opt-in-checkbox').checked = loadTimeData.getBoolean(SB_BOX_CHECKED);
   $('extended-reporting-opt-in').classList.remove('hidden');
 
-  var trickToBill = interstitialType == 'SAFEBROWSING' &&
-                    loadTimeData.getBoolean('trick_to_bill');
+  var billing = interstitialType == 'SAFEBROWSING' &&
+                    loadTimeData.getBoolean('billing');
 
   var className = 'ssl-opt-in';
-  if (interstitialType == 'SAFEBROWSING' && !trickToBill) {
+  if (interstitialType == 'SAFEBROWSING' && !billing) {
     className = 'safe-browsing-opt-in';
   }
 

components/security_interstitials/core/browser/resources/interstitial_large.js

@@ -68,8 +68,8 @@ function setupEvents() {
   var ssl = interstitialType == 'SSL';
   var captivePortal = interstitialType == 'CAPTIVE_PORTAL';
   var badClock = ssl && loadTimeData.getBoolean('bad_clock');
-  var trickToBill = interstitialType == 'SAFEBROWSING' &&
-                    loadTimeData.getBoolean('trick_to_bill');
+  var billing = interstitialType == 'SAFEBROWSING' &&
+                    loadTimeData.getBoolean('billing');
   var hidePrimaryButton = loadTimeData.getBoolean('hide_primary_button');
   var showRecurrentErrorParagraph = loadTimeData.getBoolean(
     'show_recurrent_error_paragraph');
@@ -80,8 +80,8 @@ function setupEvents() {
     $('error-code').classList.remove(HIDDEN_CLASS);
   } else if (captivePortal) {
     $('body').classList.add('captive-portal');
-  } else if (trickToBill) {
-    $('body').classList.add('safe-browsing-trick-to-bill');
+  } else if (billing) {
+    $('body').classList.add('safe-browsing-billing');
   } else {
     $('body').classList.add('safe-browsing');
     // Override the default theme color.
@@ -120,7 +120,7 @@ function setupEvents() {
   }
 
   if (overridable) {
-    var overrideElement = trickToBill ? 'proceed-button' : 'proceed-link';
+    var overrideElement = billing ? 'proceed-button' : 'proceed-link';
     // Captive portal page isn't overridable.
     $(overrideElement).addEventListener('click', function(event) {
       sendCommand(SecurityInterstitialCommandId.CMD_PROCEED);
@@ -128,7 +128,7 @@ function setupEvents() {
 
     if (ssl) {
       $(overrideElement).classList.add('small-link');
-    } else if (trickToBill) {
+    } else if (billing) {
       $(overrideElement).classList.remove(HIDDEN_CLASS);
       $(overrideElement).textContent =
           loadTimeData.getString('proceedButtonText');
@@ -156,8 +156,8 @@ function setupEvents() {
     });
   }
 
-  if (captivePortal || trickToBill) {
-    // Captive portal and trick-to-bill pages don't have details button.
+  if (captivePortal || billing) {
+    // Captive portal and billing pages don't have details button.
     $('details-button').classList.add('hidden');
   } else {
     $('details-button').addEventListener('click', function(event) {

components/security_interstitials/core/browser/resources/interstitial_safebrowsing.css

@@ -44,17 +44,17 @@ body.safe-browsing {
   }
 }
 
-.safe-browsing-trick-to-bill .small-link {
+.safe-browsing-billing .small-link {
   background-color: white;
   border:none;
   float: none;
 }
 
-.safe-browsing-trick-to-bill .small-link:hover {
+.safe-browsing-billing .small-link:hover {
   box-shadow: none;
 }
 
-.safe-browsing-trick-to-bill .icon {
+.safe-browsing-billing .icon {
   background-image: -webkit-image-set(
       url(images/1x/triangle_red.png) 1x,
       url(images/2x/triangle_red.png) 2x);

components/security_interstitials/core/browser/resources/list_of_interstitials.html

@@ -72,7 +72,7 @@
       <a href="safebrowsing?type=clientside_phishing">Client Side Phishing</a>
     </li>
     <li>
-      <a href="safebrowsing?type=trick_to_bill">Trick To Bill</a>
+      <a href="safebrowsing?type=billing">Billing</a>
     </li>
   </ul>
   <h4>Quiet (WebView)</h4>

components/security_interstitials/core/common/resources/interstitial_common.css

@@ -27,7 +27,7 @@ button {
 .offline button,
 .pdf button,
 .ssl button,
-.safe-browsing-trick-to-bill button {
+.safe-browsing-billing button {
   background: rgb(66, 133, 244);
 }
 

components/security_interstitials/core/safe_browsing_loud_error_ui.cc

@@ -94,8 +94,8 @@ void SafeBrowsingLoudErrorUI::PopulateStringsForHtml(
       always_show_back_to_safety() ? false : !controller()->CanGoBack());
 
   load_time_data->SetBoolean(
-      "trick_to_bill", interstitial_reason() ==
-                           BaseSafeBrowsingErrorUI::SB_REASON_TRICK_TO_BILL);
+      "billing",
+      interstitial_reason() == BaseSafeBrowsingErrorUI::SB_REASON_BILLING);
 
   switch (interstitial_reason()) {
     case BaseSafeBrowsingErrorUI::SB_REASON_MALWARE:
@@ -107,8 +107,8 @@ void SafeBrowsingLoudErrorUI::PopulateStringsForHtml(
     case BaseSafeBrowsingErrorUI::SB_REASON_PHISHING:
       PopulatePhishingLoadTimeData(load_time_data);
       break;
-    case BaseSafeBrowsingErrorUI::SB_REASON_TRICK_TO_BILL:
-      PopulateTrickToBillLoadTimeData(load_time_data);
+    case BaseSafeBrowsingErrorUI::SB_REASON_BILLING:
+      PopulateBillingLoadTimeData(load_time_data);
       break;
   }
 
@@ -316,24 +316,24 @@ void SafeBrowsingLoudErrorUI::PopulateExtendedReportingOption(
                              is_extended_reporting_enabled());
 }
 
-void SafeBrowsingLoudErrorUI::PopulateTrickToBillLoadTimeData(
+void SafeBrowsingLoudErrorUI::PopulateBillingLoadTimeData(
     base::DictionaryValue* load_time_data) {
   load_time_data->SetBoolean("phishing", false);
   load_time_data->SetBoolean("overridable", true);
   load_time_data->SetBoolean("hide_primary_button", false);
 
-  load_time_data->SetString(
-      "heading", l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_HEADING));
+  load_time_data->SetString("heading",
+                            l10n_util::GetStringUTF16(IDS_BILLING_HEADING));
   load_time_data->SetString(
       "primaryParagraph",
-      l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PRIMARY_PARAGRAPH));
+      l10n_util::GetStringUTF16(IDS_BILLING_PRIMARY_PARAGRAPH));
 
   load_time_data->SetString(
       "primaryButtonText",
-      l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PRIMARY_BUTTON));
+      l10n_util::GetStringUTF16(IDS_BILLING_PRIMARY_BUTTON));
   load_time_data->SetString(
       "proceedButtonText",
-      l10n_util::GetStringUTF16(IDS_TRICK_TO_BILL_PROCEED_BUTTON));
+      l10n_util::GetStringUTF16(IDS_BILLING_PROCEED_BUTTON));
 
   load_time_data->SetString("openDetails", "");
   load_time_data->SetString("closeDetails", "");

components/security_interstitials/core/safe_browsing_loud_error_ui.h

@@ -47,7 +47,7 @@ class SafeBrowsingLoudErrorUI
   void PopulateMalwareLoadTimeData(base::DictionaryValue* load_time_data);
   void PopulateHarmfulLoadTimeData(base::DictionaryValue* load_time_data);
   void PopulatePhishingLoadTimeData(base::DictionaryValue* load_time_data);
-  void PopulateTrickToBillLoadTimeData(base::DictionaryValue* load_time_data);
+  void PopulateBillingLoadTimeData(base::DictionaryValue* load_time_data);
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingLoudErrorUI);
 };

components/security_interstitials_strings.grdp

@@ -382,17 +382,17 @@
     </message>
   </if>
 
-  <!-- Trick to Bill interstitial -->
-  <message name="IDS_TRICK_TO_BILL_HEADING" desc="The large heading at the top of the trick to bill interstitial.">
+  <!-- Billing interstitial -->
+  <message name="IDS_BILLING_HEADING" desc="The large heading at the top of the billing interstitial.">
     The page ahead may try to charge you money
   </message>
-  <message name="IDS_TRICK_TO_BILL_PRIMARY_PARAGRAPH" desc="The primary explanatory paragraph for the trick to bill interstitial.">
+  <message name="IDS_BILLING_PRIMARY_PARAGRAPH" desc="The primary explanatory paragraph for the billing interstitial.">
     These charges could be one-time or recurring and may not be obvious.
   </message>
-  <message name="IDS_TRICK_TO_BILL_PRIMARY_BUTTON" desc="The text for the trick to bill interstitial primary button.">
+  <message name="IDS_BILLING_PRIMARY_BUTTON" desc="The text for the billing interstitial primary button.">
     Go Back
   </message>
-  <message name="IDS_TRICK_TO_BILL_PROCEED_BUTTON" desc="The text for the trick to bill interstitial proceed button.">
+  <message name="IDS_BILLING_PROCEED_BUTTON" desc="The text for the billing interstitial proceed button.">
     Proceed
   </message>
 </grit-part>