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

chrome/browser/safe_browsing/safe_browsing_service.h

Index: chrome/browser/safe_browsing/safe_browsing_service.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h
index e381f7a555ed42df2bad007ce9b78ad172ef9347..d1d355499100f56654c773e772e1a2d32068da10 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.h
+++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -22,7 +22,6 @@
 #include "chrome/browser/safe_browsing/services_delegate.h"
 #include "components/safe_browsing_db/safe_browsing_prefs.h"
 #include "components/safe_browsing_db/util.h"
-#include "components/safe_browsing_db/v4_feature_list.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -198,8 +197,7 @@
 
  protected:
   // Creates the safe browsing service.  Need to initialize before using.
-  SafeBrowsingService(V4FeatureList::V4UsageStatus v4_usage_status =
-                          V4FeatureList::V4UsageStatus::V4_DISABLED);
+  SafeBrowsingService();
 
   ~SafeBrowsingService() override;
 
@@ -300,12 +298,7 @@
 
   // Whether SafeBrowsing needs to be enabled in V4Only mode. In this mode, all
   // SafeBrowsing decisions are made using the PVer4 implementation.
-  bool use_v4_only_;
-
-  // Whether the PVer4 implementation needs to be instantiated. Note that even
-  // if the PVer4 implementation has been instantiated, it is used only if
-  // |use_v4_only_| is true.
-  bool v4_enabled_;
+  bool enabled_v4_only_;
 
   // Tracks existing PrefServices, and the safe browsing preference on each.
   // This is used to determine if any profile is currently using the safe