Revert of Browser tests for using the new SafeBrowsing protocol (v4)

chrome/browser/safe_browsing/test_safe_browsing_service.h

Index: chrome/browser/safe_browsing/test_safe_browsing_service.h
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_service.h b/chrome/browser/safe_browsing/test_safe_browsing_service.h
index 533c7487da12c6412923e31f39a098595689d7bb..facf791b83e2b0acad4529814245db6c0eeeb089 100644
--- a/chrome/browser/safe_browsing/test_safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/test_safe_browsing_service.h
@@ -40,8 +40,7 @@
 //   test_sb_factory_.
 class TestSafeBrowsingService : public SafeBrowsingService {
  public:
-  explicit TestSafeBrowsingService(
-      V4FeatureList::V4UsageStatus v4_usage_status);
+  TestSafeBrowsingService();
   // SafeBrowsingService overrides
   SafeBrowsingProtocolConfig GetProtocolConfig() const override;
   V4ProtocolConfig GetV4ProtocolConfig() const override;
@@ -81,9 +80,7 @@
 
 class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
  public:
-  explicit TestSafeBrowsingServiceFactory(
-      V4FeatureList::V4UsageStatus v4_usage_status =
-          V4FeatureList::V4UsageStatus::V4_DISABLED);
+  TestSafeBrowsingServiceFactory();
   ~TestSafeBrowsingServiceFactory() override;
 
   // Creates test safe browsing service, and configures test UI manager,
@@ -104,7 +101,6 @@
   scoped_refptr<TestSafeBrowsingDatabaseManager> test_database_manager_;
   scoped_refptr<TestSafeBrowsingUIManager> test_ui_manager_;
   SafeBrowsingProtocolConfig* test_protocol_config_;
-  V4FeatureList::V4UsageStatus v4_usage_status_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingServiceFactory);
 };