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

components/safe_browsing_db/v4_feature_list.h

Index: components/safe_browsing_db/v4_feature_list.h
diff --git a/components/safe_browsing_db/v4_feature_list.h b/components/safe_browsing_db/v4_feature_list.h
index 5d7079aee415980951ef1e97961a4f61212dfadd..f549a9556ab9ec9da6148facf014b629acffffd0 100644
--- a/components/safe_browsing_db/v4_feature_list.h
+++ b/components/safe_browsing_db/v4_feature_list.h
@@ -11,21 +11,18 @@
 // through Finch.
 namespace V4FeatureList {
 
-enum class V4UsageStatus {
-  // The V4 database manager is not even instantiated i.e. is diabled. All
-  // SafeBrowsing operations use PVer3 code.
-  V4_DISABLED,
+// Is the PVer4 database manager enabled? Should be true if either of those
+// below are true.
+bool IsLocalDatabaseManagerEnabled();
 
-  // The V4 database manager is instantiated, and performs background updates,
-  // but all SafeBrowsing verdicts are returned using the PVer3 database.
-  V4_INSTANTIATED,
+// Is the PVer4 database being checked for resource reputation? If this returns
+// true, use PVer4 database for CheckBrowseUrl, otherwise use PVer3.
+bool IsV4HybridEnabled();
 
-  // Only the V4 database manager is instantiated, PVer3 database manager is
-  // not. All SafeBrowsing verdicts are returned using PVer4 database.
-  V4_ONLY
-};
-
-V4UsageStatus GetV4UsageStatus();
+// Is only the PVer4 database being checked for resource reputation? If this
+// returns true, use PVer4 database for all SafeBrowsing operations, and don't
+// update the PVer3 database at all.  This is the launch configuration.
+bool IsV4OnlyEnabled();
 
 }  // namespace V4FeatureList