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

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 46 matching lines @@
 ExtendedReportingLevel
 ServicesDelegateImpl::GetEstimatedExtendedReportingLevel() const {
   return safe_browsing_service_->estimated_extended_reporting_by_prefs();
 }
 
 const scoped_refptr<SafeBrowsingDatabaseManager>&
 ServicesDelegateImpl::v4_local_database_manager() const {
   return v4_local_database_manager_;
 }
 
-void ServicesDelegateImpl::Initialize(bool v4_enabled) {
+void ServicesDelegateImpl::Initialize() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (v4_enabled) {
-    v4_local_database_manager_ = V4LocalDatabaseManager::Create(
-        SafeBrowsingService::GetBaseFilename(),
-        base::Bind(&ServicesDelegateImpl::GetEstimatedExtendedReportingLevel,
-                   base::Unretained(this)));
-  }
+  v4_local_database_manager_ = V4LocalDatabaseManager::Create(
+      SafeBrowsingService::GetBaseFilename(),
+      base::Bind(&ServicesDelegateImpl::GetEstimatedExtendedReportingLevel,
+                 base::Unretained(this)));
 
   download_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateDownloadProtectionService())
           ? services_creator_->CreateDownloadProtectionService()
           : CreateDownloadProtectionService());
   incident_service_.reset(
       (services_creator_ &&
        services_creator_->CanCreateIncidentReportingService())
           ? services_creator_->CreateIncidentReportingService()
@@ skipping 93 matching lines @@
   }
 }
 
 void ServicesDelegateImpl::StopOnIOThread(bool shutdown) {
   if (v4_local_database_manager_.get()) {
     v4_local_database_manager_->StopOnIOThread(shutdown);
   }
 }
 
 }  // namespace safe_browsing