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

components/safe_browsing_db/v4_feature_list.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_V4_FEATURE_LIST_H_
 #define COMPONENTS_SAFE_BROWSING_DB_V4_FEATURE_LIST_H_
 
 namespace safe_browsing {
 
 // Exposes methods to check whether a particular feature has been enabled
 // 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
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_V4_FEATURE_LIST_H_