Revert of Reland: Initialize and reset V4LocalDBManager. Instantiate V4Stores.

chrome/browser/safe_browsing/services_delegate_impl.cc

Index: chrome/browser/safe_browsing/services_delegate_impl.cc
diff --git a/chrome/browser/safe_browsing/services_delegate_impl.cc b/chrome/browser/safe_browsing/services_delegate_impl.cc
index ee489261fc2e11bc14256ee76ab8e2b47ae272c8..e3b5b7a122d2ec0cf50c3b7ec3813fe8fcbc41e3 100644
--- a/chrome/browser/safe_browsing/services_delegate_impl.cc
+++ b/chrome/browser/safe_browsing/services_delegate_impl.cc
@@ -180,16 +180,12 @@
 }
 
 V4LocalDatabaseManager* ServicesDelegateImpl::CreateV4LocalDatabaseManager() {
-  return new V4LocalDatabaseManager(SafeBrowsingService::GetBaseFilename());
+  return new V4LocalDatabaseManager();
 }
 
 bool ServicesDelegateImpl::IsV4LocalDatabaseManagerEnabled() {
-  bool enabled = base::FeatureList::IsEnabled(
+  return base::FeatureList::IsEnabled(
       kSafeBrowsingV4LocalDatabaseManagerEnabled);
-#ifndef NDEBUG
-  enabled = true;
-#endif
-  return enabled;
 }
 
 }  // namespace safe_browsing