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

chrome/browser/loader/safe_browsing_resource_throttle.cc

 // Copyright (c) 2012 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/loader/safe_browsing_resource_throttle.h"
 
 #include <iterator>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 39 matching lines @@
   if (sb_service->database_manager()->IsSupported()) {
     return new SafeBrowsingResourceThrottle(request, resource_type, sb_service);
   }
   return nullptr;
 }
 
 SafeBrowsingResourceThrottle::SafeBrowsingResourceThrottle(
     const net::URLRequest* request,
     content::ResourceType resource_type,
     safe_browsing::SafeBrowsingService* sb_service)
-    : safe_browsing::BaseResourceThrottle(request,
-                                          resource_type,
-                                          sb_service->database_manager(),
-                                          sb_service->ui_manager()) {}
+    : safe_browsing::BaseResourceThrottle(
+          request,
+          resource_type,
+          safe_browsing::V4FeatureList::IsV4HybridEnabled()
+              ? sb_service->v4_local_database_manager()
+              : sb_service->database_manager(),
+          sb_service->ui_manager()) {}
 
 SafeBrowsingResourceThrottle::~SafeBrowsingResourceThrottle() {}
 
 const char* SafeBrowsingResourceThrottle::GetNameForLogging() const {
   return "SafeBrowsingResourceThrottle";
 }
 
 void SafeBrowsingResourceThrottle::MaybeDestroyPrerenderContents(
     const content::ResourceRequestInfo* info) {
   // Destroy the prefetch with FINAL_STATUS_SAFEBROSWING.
@@ skipping 49 matching lines @@
       ui_manager->DisplayBlockingPage(resource);
       return;
     }
   }
 
   // Tab is gone or it's being prerendered.
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&SafeBrowsingResourceThrottle::Cancel, throttle));
 }