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

chrome/browser/safe_browsing/test_safe_browsing_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_TEST_SAFE_BROWSING_SERVICE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_TEST_SAFE_BROWSING_SERVICE_H_
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include "chrome/browser/safe_browsing/protocol_manager.h"
@@ skipping 22 matching lines @@
 //   (3) Register TestSafeBrowsingServiceFactory
 //       SafeBrowsingService::RegisterFactory(test_sb_factory_);
 //   (4) InProcessBrowserTest::SetUp() or other base class SetUp() function must
 //       be called at last.
 // * When overriding TearDown():
 //   Call base class TearDown() first then call
 //   SafeBrowsingService::RegisterFactory(nullptr) to unregister
 //   test_sb_factory_.
 class TestSafeBrowsingService : public SafeBrowsingService {
  public:
-  explicit TestSafeBrowsingService(
-      V4FeatureList::V4UsageStatus v4_usage_status);
+  TestSafeBrowsingService();
   // SafeBrowsingService overrides
   SafeBrowsingProtocolConfig GetProtocolConfig() const override;
   V4ProtocolConfig GetV4ProtocolConfig() const override;
 
   std::string serilized_download_report();
   void ClearDownloadReport();
 
   // In browser tests, the following setters must be called before
   // SafeBrowsingService::Initialize().
   // The preferable way to use these setters is by calling corresponding
@@ skipping 19 matching lines @@
   bool protocol_manager_delegate_disabled_;
   std::unique_ptr<SafeBrowsingProtocolConfig> protocol_config_;
   std::unique_ptr<V4ProtocolConfig> v4_protocol_config_;
   std::string serialized_download_report_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingService);
 };
 
 class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
  public:
-  explicit TestSafeBrowsingServiceFactory(
-      V4FeatureList::V4UsageStatus v4_usage_status =
-          V4FeatureList::V4UsageStatus::V4_DISABLED);
+  TestSafeBrowsingServiceFactory();
   ~TestSafeBrowsingServiceFactory() override;
 
   // Creates test safe browsing service, and configures test UI manager,
   // database manager and so on.
   SafeBrowsingService* CreateSafeBrowsingService() override;
 
   TestSafeBrowsingService* test_safe_browsing_service();
 
   // Test UI manager, database manager and protocol config need to be set before
   // SafeBrowsingService::Initialize() is called.
   void SetTestUIManager(TestSafeBrowsingUIManager* ui_manager);
   void SetTestDatabaseManager(
       TestSafeBrowsingDatabaseManager* database_manager);
   void SetTestProtocolConfig(const SafeBrowsingProtocolConfig& protocol_config);
 
  private:
   TestSafeBrowsingService* test_safe_browsing_service_;
   scoped_refptr<TestSafeBrowsingDatabaseManager> test_database_manager_;
   scoped_refptr<TestSafeBrowsingUIManager> test_ui_manager_;
   SafeBrowsingProtocolConfig* test_protocol_config_;
-  V4FeatureList::V4UsageStatus v4_usage_status_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingServiceFactory);
 };
 
 // This is an implemenation of SafeBrowsingUIManager without actually
 // sending report to safe browsing backend. Safe browsing reports are
 // stored in strings for easy verification.
 class TestSafeBrowsingUIManager : public SafeBrowsingUIManager {
  public:
   TestSafeBrowsingUIManager();
   explicit TestSafeBrowsingUIManager(
       const scoped_refptr<SafeBrowsingService>& service);
   void SendSerializedThreatDetails(const std::string& serialized) override;
   void SetSafeBrowsingService(SafeBrowsingService* sb_service);
   std::list<std::string>* GetThreatDetails();
 
  protected:
   ~TestSafeBrowsingUIManager() override;
   std::list<std::string> details_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSafeBrowsingUIManager);
 };
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_TEST_SAFE_BROWSING_SERVICE_H_