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

chrome/browser/safe_browsing/test_safe_browsing_service.cc

 // Copyright (c) 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/test_safe_browsing_service.h"
 
 #include "base/strings/string_util.h"
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 #include "chrome/browser/safe_browsing/ping_manager.h"
 #include "chrome/browser/safe_browsing/ui_manager.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/test_database_manager.h"
-#include "components/safe_browsing_db/v4_feature_list.h"
 
 namespace safe_browsing {
 
 // TestSafeBrowsingService functions:
-TestSafeBrowsingService::TestSafeBrowsingService(
-    V4FeatureList::V4UsageStatus v4_usage_status)
-    : SafeBrowsingService(v4_usage_status),
-      protocol_manager_delegate_disabled_(false),
+TestSafeBrowsingService::TestSafeBrowsingService()
+    : protocol_manager_delegate_disabled_(false),
       serialized_download_report_(base::EmptyString()) {}
 
 TestSafeBrowsingService::~TestSafeBrowsingService() {}
 
 SafeBrowsingProtocolConfig TestSafeBrowsingService::GetProtocolConfig() const {
   if (protocol_config_)
     return *protocol_config_;
   return SafeBrowsingService::GetProtocolConfig();
 }
 
@@ skipping 54 matching lines @@
     SafeBrowsingProtocolConfig* protocol_config) {
   protocol_config_.reset(protocol_config);
 }
 
 void TestSafeBrowsingService::SetV4ProtocolConfig(
     V4ProtocolConfig* v4_protocol_config) {
   v4_protocol_config_.reset(v4_protocol_config);
 }
 
 // TestSafeBrowsingServiceFactory functions:
-TestSafeBrowsingServiceFactory::TestSafeBrowsingServiceFactory(
-    V4FeatureList::V4UsageStatus v4_usage_status)
-    : test_safe_browsing_service_(nullptr),
-      test_protocol_config_(nullptr),
-      v4_usage_status_(v4_usage_status) {}
+TestSafeBrowsingServiceFactory::TestSafeBrowsingServiceFactory()
+    : test_safe_browsing_service_(nullptr), test_protocol_config_(nullptr) {}
 
 TestSafeBrowsingServiceFactory::~TestSafeBrowsingServiceFactory() {}
 
 SafeBrowsingService*
 TestSafeBrowsingServiceFactory::CreateSafeBrowsingService() {
   // Instantiate TestSafeBrowsingService.
-  test_safe_browsing_service_ = new TestSafeBrowsingService(v4_usage_status_);
+  test_safe_browsing_service_ = new TestSafeBrowsingService();
   // Plug-in test member clases accordingly.
   if (test_ui_manager_)
     test_safe_browsing_service_->SetUIManager(test_ui_manager_.get());
   if (test_database_manager_) {
     test_safe_browsing_service_->SetDatabaseManager(
         test_database_manager_.get());
   }
   if (test_protocol_config_)
     test_safe_browsing_service_->SetProtocolConfig(test_protocol_config_);
   return test_safe_browsing_service_;
@@ skipping 36 matching lines @@
     const std::string& serialized) {
   details_.push_back(serialized);
 }
 
 std::list<std::string>* TestSafeBrowsingUIManager::GetThreatDetails() {
   return &details_;
 }
 
 TestSafeBrowsingUIManager::~TestSafeBrowsingUIManager() {}
 }  // namespace safe_browsing