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

components/safe_browsing_db/v4_feature_list.cc

Index: components/safe_browsing_db/v4_feature_list.cc
diff --git a/components/safe_browsing_db/v4_feature_list.cc b/components/safe_browsing_db/v4_feature_list.cc
index 9d166e9f15ba360e530f599772d55fc5d5622ad3..323ad4db74f396de0e85e3b07dd198e6735764ec 100644
--- a/components/safe_browsing_db/v4_feature_list.cc
+++ b/components/safe_browsing_db/v4_feature_list.cc
@@ -10,35 +10,31 @@
 namespace V4FeatureList {
 
 namespace {
-
 const base::Feature kLocalDatabaseManagerEnabled{
     "SafeBrowsingV4LocalDatabaseManagerEnabled",
     base::FEATURE_DISABLED_BY_DEFAULT};
 
+const base::Feature kV4HybridEnabled{"SafeBrowsingV4HybridEnabled",
+                                     base::FEATURE_DISABLED_BY_DEFAULT};
+
 const base::Feature kV4OnlyEnabled{"SafeBrowsingV4OnlyEnabled",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
 
-bool IsV4OnlyEnabled() {
-  return base::FeatureList::IsEnabled(kV4OnlyEnabled);
-}
+}  // namespace
 
 bool IsLocalDatabaseManagerEnabled() {
   return base::FeatureList::IsEnabled(kLocalDatabaseManagerEnabled) ||
-         IsV4OnlyEnabled();
+         IsV4HybridEnabled() || IsV4OnlyEnabled();
 }
 
-}  // namespace
+bool IsV4HybridEnabled() {
+  return base::FeatureList::IsEnabled(kV4HybridEnabled);
+}
 
-V4UsageStatus GetV4UsageStatus() {
-  V4UsageStatus v4_usage_status;
-  if (safe_browsing::V4FeatureList::IsV4OnlyEnabled()) {
-    v4_usage_status = V4UsageStatus::V4_ONLY;
-  } else if (safe_browsing::V4FeatureList::IsLocalDatabaseManagerEnabled()) {
-    v4_usage_status = V4UsageStatus::V4_INSTANTIATED;
-  } else {
-    v4_usage_status = V4UsageStatus::V4_DISABLED;
-  }
-  return v4_usage_status;
+bool IsV4OnlyEnabled() {
+  // TODO(vakh): Enable this only when all the lists can be synced from the
+  // server. See http://b/33182208
+  return base::FeatureList::IsEnabled(kV4OnlyEnabled);
 }
 
 }  // namespace V4FeatureList