Features: kBillingInterstitial to ON, drop kInspectDownloadedRarFiles

R=drubery

Bug: 867518, 750327
Change-Id: Id6ce3502a99a19767d0056a30cf626bc825ff56d
Reviewed-on: https://chromium-review.googlesource.com/c/1355134Reviewed-by: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612370}

chrome/browser/safe_browsing/download_protection/file_analyzer.cc

@@ -94,8 +94,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
 
   if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".zip"))) {
     StartExtractZipFeatures();
-  } else if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".rar")) &&
-             base::FeatureList::IsEnabled(kInspectDownloadedRarFiles)) {
+  } else if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".rar"))) {
     StartExtractRarFeatures();
 #if defined(OS_MACOSX)
   } else if (target_path_.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||

chrome/common/safe_browsing/download_type_util.cc

@@ -32,8 +32,7 @@ ClientDownloadRequest::DownloadType GetDownloadType(
     // placeholder. The correct DownloadType will be determined based on the
     // result of analyzing the ZIP file.
     return ClientDownloadRequest::ZIPPED_EXECUTABLE;
-  else if (base::FeatureList::IsEnabled(kInspectDownloadedRarFiles) &&
-           file.MatchesExtension(FILE_PATH_LITERAL(".rar")))
+  else if (file.MatchesExtension(FILE_PATH_LITERAL(".rar")))
     // See the comment for .zip files.
     return ClientDownloadRequest::RAR_COMPRESSED_EXECUTABLE;
   else if (file.MatchesExtension(FILE_PATH_LITERAL(".dmg")) ||

chrome/common/safe_browsing/download_type_util_unittest.cc

@@ -19,9 +19,7 @@ TEST(DownloadProtectionUtilTest, KnownValues) {
             GetDownloadType(base::FilePath(FILE_PATH_LITERAL("foo.crx"))));
   EXPECT_EQ(ClientDownloadRequest::ZIPPED_EXECUTABLE,
             GetDownloadType(base::FilePath(FILE_PATH_LITERAL("foo.zip"))));
-  EXPECT_EQ(base::FeatureList::IsEnabled(kInspectDownloadedRarFiles)
-                ? ClientDownloadRequest::RAR_COMPRESSED_EXECUTABLE
-                : ClientDownloadRequest::ARCHIVE,
+  EXPECT_EQ(ClientDownloadRequest::RAR_COMPRESSED_EXECUTABLE,
             GetDownloadType(base::FilePath(FILE_PATH_LITERAL("foo.rar"))));
   EXPECT_EQ(ClientDownloadRequest::MAC_EXECUTABLE,
             GetDownloadType(base::FilePath(FILE_PATH_LITERAL("foo.pkg"))));

components/safe_browsing/features.cc

@@ -24,7 +24,7 @@ const base::Feature kAdSamplerTriggerFeature{"SafeBrowsingAdSamplerTrigger",
 
 // Controls the billing interstitial UI.
 const base::Feature kBillingInterstitial{"BillingInterstitial",
-                                         base::FEATURE_DISABLED_BY_DEFAULT};
+                                         base::FEATURE_ENABLED_BY_DEFAULT};
 
 // If enabled in pre-network-service world, SafeBrowsing URL checks are done by
 // applying SafeBrowsing's URLLoaderThrottle subclasses to ThrottlingURLLoader.
@@ -39,9 +39,6 @@ const base::Feature kCheckByURLLoaderThrottle{
 const base::Feature kForceEnableResetPasswordWebUI{
     "ForceEnableResetPasswordWebUI", base::FEATURE_DISABLED_BY_DEFAULT};
 
-const base::Feature kInspectDownloadedRarFiles{
-    "InspectDownloadedRarFiles", base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kSuspiciousSiteTriggerQuotaFeature{
     "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
 
@@ -68,7 +65,6 @@ constexpr struct {
     {&kBillingInterstitial, true},
     {&kCheckByURLLoaderThrottle, true},
     {&kForceEnableResetPasswordWebUI, true},
-    {&kInspectDownloadedRarFiles, true},
     {&kSuspiciousSiteTriggerQuotaFeature, true},
     {&kThreatDomDetailsTagAndAttributeFeature, false},
     {&kTriggerThrottlerDailyQuotaFeature, false},

components/safe_browsing/features.h

@@ -30,10 +30,6 @@ extern const base::Feature kCheckByURLLoaderThrottle;
 // purpose.
 extern const base::Feature kForceEnableResetPasswordWebUI;
 
-// Controls whether .rar files downloaded by the user are inspected for being
-// unsafe.
-extern const base::Feature kInspectDownloadedRarFiles;
-
 // Controls the daily quota for the suspicious site trigger.
 extern const base::Feature kSuspiciousSiteTriggerQuotaFeature;
 

testing/variations/fieldtrial_testing_config.json

@@ -2425,24 +2425,6 @@
             ]
         }
     ],
-    "InspectDownloadedRarFiles": [
-        {
-            "platforms": [
-                "chromeos",
-                "linux",
-                "mac",
-                "windows"
-            ],
-            "experiments": [
-                {
-                    "name": "Enabled",
-                    "enable_features": [
-                        "InspectDownloadedRarFiles"
-                    ]
-                }
-            ]
-        }
-    ],
     "InstanceID": [
         {
             "platforms": [