Reland: Initialize and reset V4LocalDBManager. Instantiate V4Stores.

chrome/browser/safe_browsing/services_delegate_impl.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/services_delegate_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 162 matching lines @@
   }
 }
 
 void ServicesDelegateImpl::StopOnIOThread(bool shutdown) {
   if (v4_local_database_manager_.get()) {
     v4_local_database_manager_->StopOnIOThread(shutdown);
   }
 }
 
 V4LocalDatabaseManager* ServicesDelegateImpl::CreateV4LocalDatabaseManager() {
-  return new V4LocalDatabaseManager();
+  return new V4LocalDatabaseManager(SafeBrowsingService::GetBaseFilename());
 }
 
 bool ServicesDelegateImpl::IsV4LocalDatabaseManagerEnabled() {
-  return base::FeatureList::IsEnabled(
+  bool enabled = base::FeatureList::IsEnabled(
       kSafeBrowsingV4LocalDatabaseManagerEnabled);
+#ifndef NDEBUG
+  enabled = true;
+#endif
+  return enabled;
 }
 
 }  // namespace safe_browsing