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

components/safe_browsing_db/v4_database_unittest.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 "base/bind.h"
 #include "base/debug/leak_annotations.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 73 matching lines @@
 
     SetupInfoMapAndExpectedState();
   }
 
   void TearDown() override {
     V4Database::RegisterStoreFactoryForTest(nullptr);
     PlatformTest::TearDown();
   }
 
   void RegisterFactory(bool hash_prefix_matches = true) {
-    V4Database::RegisterStoreFactoryForTest(
-        base::MakeUnique<FakeV4StoreFactory>(hash_prefix_matches));
+    factory_.reset(new FakeV4StoreFactory(hash_prefix_matches));
+    V4Database::RegisterStoreFactoryForTest(factory_.get());
   }
 
   void SetupInfoMapAndExpectedState() {
     list_infos_.emplace_back(true, "win_url_malware", win_malware_id_,
                              SB_THREAT_TYPE_URL_MALWARE);
     expected_identifiers_.push_back(win_malware_id_);
     expected_store_paths_.push_back(
         database_dirname_.AppendASCII("win_url_malware.fake"));
 
     list_infos_.emplace_back(true, "linux_url_malware", linux_malware_id_,
@@ skipping 93 matching lines @@
   std::unique_ptr<V4Database> v4_database_;
   base::FilePath database_dirname_;
   base::ScopedTempDir temp_dir_;
   content::TestBrowserThreadBundle thread_bundle_;
   bool created_but_not_called_back_;
   bool created_and_called_back_;
   bool verify_checksum_called_back_;
   ListInfos list_infos_;
   std::vector<ListIdentifier> expected_identifiers_;
   std::vector<base::FilePath> expected_store_paths_;
+  std::unique_ptr<FakeV4StoreFactory> factory_;
   DatabaseUpdatedCallback callback_db_updated_;
   NewDatabaseReadyCallback callback_db_ready_;
   StoreStateMap expected_store_state_map_;
   base::hash_map<ListIdentifier, V4Store*> old_stores_map_;
   const ListIdentifier linux_malware_id_, win_malware_id_;
 };
 
 // Test to set up the database with fake stores.
 TEST_F(V4DatabaseTest, TestSetupDatabaseWithFakeStores) {
   RegisterFactory();
@@ skipping 289 matching lines @@
   // Step 3: Before V4Store::ApplyUpdate gets executed on the task runner,
   // destroy the database. This posts ~V4Database() on the task runner.
   V4Database::Destroy(std::move(v4_database_));
 
   // Step 4: Wait for the task runner to go to completion. The test should
   // finish to completion and the |null_callback| should not get called.
   WaitForTasksOnTaskRunner();
 }
 
 }  // namespace safe_browsing