103 files changed, 0 insertions, 329 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index 6407e53..0095efb 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -7,17 +7,11 @@
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
 #include "base/file_util.h"
-#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/metrics/stats_counters.h"
-#include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/scoped_temp_dir.h"
 #include "base/sha2.h"
-#include "base/string_util.h"
 #include "base/time.h"
-#include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
 #include "chrome/browser/safe_browsing/safe_browsing_store_file.h"
 #include "chrome/browser/safe_browsing/safe_browsing_store_sqlite.h"
@@ -1164,234 +1158,3 @@ TEST_F(SafeBrowsingDatabaseTest, DISABLED_FileCorruptionHandling) {
 
   database_.reset();
 }
-
-namespace {
-
-void PrintStat(const char* name) {
-  int value = base::StatsTable::current()->GetCounterValue(name);
-  SB_DLOG(INFO) << StringPrintf("%s %d", name, value);
-}
-
-FilePath GetFullSBDataPath(const FilePath& path) {
-  FilePath full_path;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &full_path)) {
-    ADD_FAILURE() << "Unable to find test DIR_SOURCE_ROOT for test data.";
-    return FilePath();
-  }
-  full_path = full_path.AppendASCII("chrome");
-  full_path = full_path.AppendASCII("test");
-  full_path = full_path.AppendASCII("data");
-  full_path = full_path.AppendASCII("safe_browsing");
-  full_path = full_path.Append(path);
-  return full_path;
-}
-
-// TODO(shess): The clients of this structure manually manage
-// |chunks|.  Improve this code to apply the RAII idiom to manage
-// |chunks|.
-struct ChunksInfo {
-  SBChunkList* chunks;  // weak
-  std::string listname;
-};
-
-// TODO(shess): Move this into SafeBrowsingDatabaseTest.
-void PerformUpdate(SafeBrowsingDatabaseNew* database,
-                   const FilePath& database_filename,
-                   const FilePath& initial_db,
-                   const std::vector<ChunksInfo>& chunks,
-                   const std::vector<SBChunkDelete>& deletes) {
-  base::IoCounters before, after;
-
-  if (!initial_db.empty()) {
-    FilePath full_initial_db = GetFullSBDataPath(initial_db);
-    ASSERT_FALSE(full_initial_db.empty());
-    ASSERT_TRUE(file_util::PathExists(full_initial_db));
-    ASSERT_TRUE(file_util::CopyFile(full_initial_db, database_filename));
-  }
-
-  Time before_time = Time::Now();
-  base::ProcessHandle handle = base::Process::Current().handle();
-  scoped_ptr<base::ProcessMetrics> metric(
-#if !defined(OS_MACOSX)
-      base::ProcessMetrics::CreateProcessMetrics(handle));
-#else
-      // Getting stats only for the current process is enough, so NULL is fine.
-      base::ProcessMetrics::CreateProcessMetrics(handle, NULL));
-#endif
-  // Get IO stats.  These are currently not supported on Mac, and may not be
-  // available for Linux, so we check the result and only show IO stats if
-  // they are available.
-  bool gotIOCounters = metric->GetIOCounters(&before);
-
-  std::vector<SBListChunkRanges> lists;
-  EXPECT_TRUE(database->UpdateStarted(&lists));
-  database->DeleteChunks(deletes);
-  for (size_t i = 0; i < chunks.size(); ++i)
-    database->InsertChunks(chunks[i].listname, *chunks[i].chunks);
-
-  database->UpdateFinished(true);
-
-  gotIOCounters = gotIOCounters && metric->GetIOCounters(&after);
-
-  if (gotIOCounters) {
-    SB_DLOG(INFO) << StringPrintf("I/O Read Bytes: %" PRIu64,
-        after.ReadTransferCount - before.ReadTransferCount);
-    SB_DLOG(INFO) << StringPrintf("I/O Write Bytes: %" PRIu64,
-        after.WriteTransferCount - before.WriteTransferCount);
-    SB_DLOG(INFO) << StringPrintf("I/O Reads: %" PRIu64,
-        after.ReadOperationCount - before.ReadOperationCount);
-    SB_DLOG(INFO) << StringPrintf("I/O Writes: %" PRIu64,
-        after.WriteOperationCount - before.WriteOperationCount);
-  }
-  SB_DLOG(INFO) << StringPrintf("Finished in %" PRId64 " ms",
-      (Time::Now() - before_time).InMilliseconds());
-
-  PrintStat("c:SB.HostSelect");
-  PrintStat("c:SB.HostSelectForBloomFilter");
-  PrintStat("c:SB.HostReplace");
-  PrintStat("c:SB.HostInsert");
-  PrintStat("c:SB.HostDelete");
-  PrintStat("c:SB.ChunkSelect");
-  PrintStat("c:SB.ChunkInsert");
-  PrintStat("c:SB.ChunkDelete");
-  PrintStat("c:SB.TransactionCommit");
-}
-
-void UpdateDatabase(SafeBrowsingDatabaseNew* database,
-                    const FilePath& database_filename,
-                    const FilePath& initial_db,
-                    const FilePath& response_path,
-                    const FilePath& updates_path) {
-  // First we read the chunks from disk, so that this isn't counted in IO bytes.
-  std::vector<ChunksInfo> chunks;
-
-  SafeBrowsingProtocolParser parser;
-  if (!updates_path.empty()) {
-    FilePath data_dir = GetFullSBDataPath(updates_path);
-    ASSERT_FALSE(data_dir.empty());
-    ASSERT_TRUE(file_util::PathExists(data_dir));
-    file_util::FileEnumerator file_enum(data_dir, false,
-        file_util::FileEnumerator::FILES);
-    while (true) {
-      FilePath file = file_enum.Next();
-      if (file.empty())
-        break;
-
-      int64 size64;
-      bool result = file_util::GetFileSize(file, &size64);
-      ASSERT_TRUE(result);
-
-      int size = static_cast<int>(size64);
-      scoped_array<char> data(new char[size]);
-      file_util::ReadFile(file, data.get(), size);
-
-      ChunksInfo info;
-      info.chunks = new SBChunkList;
-
-      bool re_key;
-      result = parser.ParseChunk(data.get(), size, "", "",
-                                 &re_key, info.chunks);
-      ASSERT_TRUE(result);
-
-      info.listname = WideToASCII(file.BaseName().ToWStringHack());
-      size_t index = info.listname.find('_');  // Get rid fo the _s or _a.
-      info.listname.resize(index);
-      info.listname.erase(0, 3);  // Get rid of the 000 etc.
-
-      chunks.push_back(info);
-    }
-  }
-
-  std::vector<SBChunkDelete> deletes;
-  if (!response_path.empty()) {
-    std::string update;
-    FilePath full_response_path = GetFullSBDataPath(response_path);
-    ASSERT_FALSE(full_response_path.empty());
-    ASSERT_TRUE(file_util::PathExists(full_response_path));
-    if (file_util::ReadFileToString(full_response_path, &update)) {
-      int next_update;
-      bool result, rekey, reset;
-      std::vector<ChunkUrl> urls;
-      result = parser.ParseUpdate(update.c_str(),
-                                  static_cast<int>(update.length()),
-                                  "",
-                                  &next_update,
-                                  &rekey,
-                                  &reset,
-                                  &deletes,
-                                  &urls);
-      ASSERT_TRUE(result);
-      if (!updates_path.empty())
-        ASSERT_EQ(urls.size(), chunks.size());
-    }
-  }
-
-  PerformUpdate(database, database_filename, initial_db, chunks, deletes);
-
-  // TODO(shess): Make ChunksInfo handle this via scoping.
-  for (std::vector<ChunksInfo>::iterator iter = chunks.begin();
-       iter != chunks.end(); ++iter) {
-    delete iter->chunks;
-    iter->chunks = NULL;
-  }
-}
-
-// Construct the shared base path used by the GetOld* functions.
-FilePath BasePath() {
-  return FilePath(FILE_PATH_LITERAL("old"));
-}
-
-FilePath GetOldSafeBrowsingPath() {
-  return BasePath().AppendASCII("SafeBrowsing");
-}
-
-FilePath GetOldResponsePath() {
-  return BasePath().AppendASCII("response");
-}
-
-FilePath GetOldUpdatesPath() {
-  return BasePath().AppendASCII("updates");
-}
-
-}  // namespace
-
-// Counts the IO needed for the initial update of a database.
-// test\data\safe_browsing\download_update.py was used to fetch the add/sub
-// chunks that are read, in order to get repeatable runs.
-TEST_F(SafeBrowsingDatabaseTest, DatabaseInitialIO) {
-  UpdateDatabase(database_.get(), database_filename_,
-                 FilePath(), FilePath(), FilePath().AppendASCII("initial"));
-}
-
-// Counts the IO needed to update a month old database.
-// The data files were generated by running "..\download_update.py postdata"
-// in the "safe_browsing\old" directory.
-TEST_F(SafeBrowsingDatabaseTest, DatabaseOldIO) {
-  UpdateDatabase(database_.get(), database_filename_, GetOldSafeBrowsingPath(),
-                 GetOldResponsePath(), GetOldUpdatesPath());
-}
-
-// Like DatabaseOldIO but only the deletes.
-TEST_F(SafeBrowsingDatabaseTest, DatabaseOldDeletesIO) {
-  UpdateDatabase(database_.get(), database_filename_,
-                 GetOldSafeBrowsingPath(), GetOldResponsePath(), FilePath());
-}
-
-// Like DatabaseOldIO but only the updates.
-TEST_F(SafeBrowsingDatabaseTest, DatabaseOldUpdatesIO) {
-  UpdateDatabase(database_.get(), database_filename_,
-                 GetOldSafeBrowsingPath(), FilePath(), GetOldUpdatesPath());
-}
-
-// Does a a lot of addel's on very large chunks.
-TEST_F(SafeBrowsingDatabaseTest, DatabaseOldLotsofDeletesIO) {
-  std::vector<ChunksInfo> chunks;
-  std::vector<SBChunkDelete> deletes;
-  SBChunkDelete del;
-  del.is_sub_del = false;
-  del.list_name = safe_browsing_util::kMalwareList;
-  del.chunk_del.push_back(ChunkRange(3539, 3579));
-  deletes.push_back(del);
-  PerformUpdate(database_.get(), database_filename_,
-                GetOldSafeBrowsingPath(), chunks, deletes);
-}
diff --git a/chrome/test/data/safe_browsing/download_update.py b/chrome/test/data/safe_browsing/download_update.py
deleted file mode 100755
index 717025c..0000000
--- a/chrome/test/data/safe_browsing/download_update.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2009 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.
-
-import urllib,sys
-
-
-url = 'http://safebrowsing.clients.google.com/safebrowsing/downloads?client=googleclient&appver=1.0&pver=2.1'
-
-if len(sys.argv) == 1:
-  data = 'goog-phish-shavar;\ngoog-malware-shavar;\n'
-else:
-  post_data_file = sys.argv[1]
-  file = open(post_data_file, "r")
-  data = file.read()
-  file.close
-
-response = urllib.urlopen(url, data)
-
-response_file = open("response", "r+")
-response_file.write(response.read())
-response_file.seek(0)
-
-counter = 0
-
-for line in response_file:
-  if not line.startswith('u:'):
-    continue
-
-  chunk_url = 'http://' + line[2:]
-  filename = chunk_url[chunk_url.rfind('/') + 1:]
-  filename =  "%03d" % counter + filename[0:filename.rfind('_')]
-  counter += 1
-
-  urllib.urlretrieve(chunk_url, filename)
-
-response_file.close()
diff --git a/chrome/test/data/safe_browsing/filter/database b/chrome/test/data/safe_browsing/filter/database
deleted file mode 100644
index 2a284cc..0000000
--- a/chrome/test/data/safe_browsing/filter/database
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/filter/urls b/chrome/test/data/safe_browsing/filter/urls
deleted file mode 100644
index 68a286c..0000000
--- a/chrome/test/data/safe_browsing/filter/urls
+++ /dev/null
@@ -1,4 +0,0 @@
-http://www.google.com/
-http://www.yahoo.com/
-http://www.apple.com/
-
diff --git a/chrome/test/data/safe_browsing/initial/000goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/000goog-malware-shavar_s
deleted file mode 100644
index 2f70434..0000000
--- a/chrome/test/data/safe_browsing/initial/000goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/001goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/001goog-malware-shavar_s
deleted file mode 100644
index dd660ae..0000000
--- a/chrome/test/data/safe_browsing/initial/001goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/002goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/002goog-malware-shavar_s
deleted file mode 100644
index 7d81aef..0000000
--- a/chrome/test/data/safe_browsing/initial/002goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/003goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/003goog-malware-shavar_s
deleted file mode 100644
index 0f18dea..0000000
--- a/chrome/test/data/safe_browsing/initial/003goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/004goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/004goog-malware-shavar_s
deleted file mode 100644
index 156d187..0000000
--- a/chrome/test/data/safe_browsing/initial/004goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/005goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/005goog-malware-shavar_s
deleted file mode 100644
index 66f35f3..0000000
--- a/chrome/test/data/safe_browsing/initial/005goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/006goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/006goog-malware-shavar_s
deleted file mode 100644
index c13fbc3..0000000
--- a/chrome/test/data/safe_browsing/initial/006goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/007goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/007goog-malware-shavar_s
deleted file mode 100644
index 8e30acb..0000000
--- a/chrome/test/data/safe_browsing/initial/007goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/008goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/008goog-malware-shavar_s
deleted file mode 100644
index 58ccc45..0000000
--- a/chrome/test/data/safe_browsing/initial/008goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/009goog-malware-shavar_s b/chrome/test/data/safe_browsing/initial/009goog-malware-shavar_s
deleted file mode 100644
index ebca6c6..0000000
--- a/chrome/test/data/safe_browsing/initial/009goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/010goog-malware-shavar_a b/chrome/test/data/safe_browsing/initial/010goog-malware-shavar_a
deleted file mode 100644
index 0bed13ca..0000000
--- a/chrome/test/data/safe_browsing/initial/010goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/011goog-malware-shavar_a b/chrome/test/data/safe_browsing/initial/011goog-malware-shavar_a
deleted file mode 100644
index dac6efd..0000000
--- a/chrome/test/data/safe_browsing/initial/011goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/012goog-malware-shavar_a b/chrome/test/data/safe_browsing/initial/012goog-malware-shavar_a
deleted file mode 100644
index 06abcc5..0000000
--- a/chrome/test/data/safe_browsing/initial/012goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/013goog-malware-shavar_a b/chrome/test/data/safe_browsing/initial/013goog-malware-shavar_a
deleted file mode 100644
index 0b1b2ce..0000000
--- a/chrome/test/data/safe_browsing/initial/013goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/014goog-malware-shavar_a b/chrome/test/data/safe_browsing/initial/014goog-malware-shavar_a
deleted file mode 100644
index 27500b2..0000000
--- a/chrome/test/data/safe_browsing/initial/014goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/015goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/015goog-phish-shavar_s
deleted file mode 100644
index 5571b11..0000000
--- a/chrome/test/data/safe_browsing/initial/015goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/016goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/016goog-phish-shavar_s
deleted file mode 100644
index 588a9c3..0000000
--- a/chrome/test/data/safe_browsing/initial/016goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/017goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/017goog-phish-shavar_s
deleted file mode 100644
index a18cfc5..0000000
--- a/chrome/test/data/safe_browsing/initial/017goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/018goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/018goog-phish-shavar_s
deleted file mode 100644
index a6b7fad..0000000
--- a/chrome/test/data/safe_browsing/initial/018goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/019goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/019goog-phish-shavar_s
deleted file mode 100644
index 672d40b..0000000
--- a/chrome/test/data/safe_browsing/initial/019goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/020goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/020goog-phish-shavar_s
deleted file mode 100644
index 2b551cb..0000000
--- a/chrome/test/data/safe_browsing/initial/020goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/021goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/021goog-phish-shavar_s
deleted file mode 100644
index 3bffe0f..0000000
--- a/chrome/test/data/safe_browsing/initial/021goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/022goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/022goog-phish-shavar_s
deleted file mode 100644
index d441b11..0000000
--- a/chrome/test/data/safe_browsing/initial/022goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/023goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/023goog-phish-shavar_s
deleted file mode 100644
index 0593ff6..0000000
--- a/chrome/test/data/safe_browsing/initial/023goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/024goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/024goog-phish-shavar_s
deleted file mode 100644
index a08966a..0000000
--- a/chrome/test/data/safe_browsing/initial/024goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/025goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/025goog-phish-shavar_s
deleted file mode 100644
index cbc6de3..0000000
--- a/chrome/test/data/safe_browsing/initial/025goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/026goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/026goog-phish-shavar_s
deleted file mode 100644
index d77f24d..0000000
--- a/chrome/test/data/safe_browsing/initial/026goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/027goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/027goog-phish-shavar_s
deleted file mode 100644
index 7469338..0000000
--- a/chrome/test/data/safe_browsing/initial/027goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/028goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/028goog-phish-shavar_s
deleted file mode 100644
index a317a27..0000000
--- a/chrome/test/data/safe_browsing/initial/028goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/029goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/029goog-phish-shavar_s
deleted file mode 100644
index cefbff0..0000000
--- a/chrome/test/data/safe_browsing/initial/029goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/030goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/030goog-phish-shavar_s
deleted file mode 100644
index 458f1ab..0000000
--- a/chrome/test/data/safe_browsing/initial/030goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/031goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/031goog-phish-shavar_s
deleted file mode 100644
index 415b39e..0000000
--- a/chrome/test/data/safe_browsing/initial/031goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/032goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/032goog-phish-shavar_s
deleted file mode 100644
index b31ed3746..0000000
--- a/chrome/test/data/safe_browsing/initial/032goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/033goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/033goog-phish-shavar_s
deleted file mode 100644
index 9ca635a..0000000
--- a/chrome/test/data/safe_browsing/initial/033goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/034goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/034goog-phish-shavar_s
deleted file mode 100644
index 57cccd6..0000000
--- a/chrome/test/data/safe_browsing/initial/034goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/035goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/035goog-phish-shavar_s
deleted file mode 100644
index 0f4f981..0000000
--- a/chrome/test/data/safe_browsing/initial/035goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/036goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/036goog-phish-shavar_s
deleted file mode 100644
index f3a46d2..0000000
--- a/chrome/test/data/safe_browsing/initial/036goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/037goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/037goog-phish-shavar_s
deleted file mode 100644
index 3c35575..0000000
--- a/chrome/test/data/safe_browsing/initial/037goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/038goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/038goog-phish-shavar_s
deleted file mode 100644
index 9230663..0000000
--- a/chrome/test/data/safe_browsing/initial/038goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/039goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/039goog-phish-shavar_s
deleted file mode 100644
index 32cdec4..0000000
--- a/chrome/test/data/safe_browsing/initial/039goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/040goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/040goog-phish-shavar_s
deleted file mode 100644
index bc32d54..0000000
--- a/chrome/test/data/safe_browsing/initial/040goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/041goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/041goog-phish-shavar_s
deleted file mode 100644
index 2ff0a2a..0000000
--- a/chrome/test/data/safe_browsing/initial/041goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/042goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/042goog-phish-shavar_s
deleted file mode 100644
index 586cbff..0000000
--- a/chrome/test/data/safe_browsing/initial/042goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/043goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/043goog-phish-shavar_s
deleted file mode 100644
index ad319749..0000000
--- a/chrome/test/data/safe_browsing/initial/043goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/044goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/044goog-phish-shavar_s
deleted file mode 100644
index 6622fba..0000000
--- a/chrome/test/data/safe_browsing/initial/044goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/045goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/045goog-phish-shavar_s
deleted file mode 100644
index 107d5d4..0000000
--- a/chrome/test/data/safe_browsing/initial/045goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/046goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/046goog-phish-shavar_s
deleted file mode 100644
index e8c6b9e..0000000
--- a/chrome/test/data/safe_browsing/initial/046goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/047goog-phish-shavar_s b/chrome/test/data/safe_browsing/initial/047goog-phish-shavar_s
deleted file mode 100644
index cd99328..0000000
--- a/chrome/test/data/safe_browsing/initial/047goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/048goog-phish-shavar_a b/chrome/test/data/safe_browsing/initial/048goog-phish-shavar_a
deleted file mode 100644
index 9f0a267..0000000
--- a/chrome/test/data/safe_browsing/initial/048goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/049goog-phish-shavar_a b/chrome/test/data/safe_browsing/initial/049goog-phish-shavar_a
deleted file mode 100644
index fab1ea4..0000000
--- a/chrome/test/data/safe_browsing/initial/049goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/050goog-phish-shavar_a b/chrome/test/data/safe_browsing/initial/050goog-phish-shavar_a
deleted file mode 100644
index 2ed4261..0000000
--- a/chrome/test/data/safe_browsing/initial/050goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/051goog-phish-shavar_a b/chrome/test/data/safe_browsing/initial/051goog-phish-shavar_a
deleted file mode 100644
index b5206f7..0000000
--- a/chrome/test/data/safe_browsing/initial/051goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/initial/052goog-phish-shavar_a b/chrome/test/data/safe_browsing/initial/052goog-phish-shavar_a
deleted file mode 100644
index e3634f4..0000000
--- a/chrome/test/data/safe_browsing/initial/052goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/SafeBrowsing b/chrome/test/data/safe_browsing/old/SafeBrowsing
deleted file mode 100644
index 5a51ecd..0000000
--- a/chrome/test/data/safe_browsing/old/SafeBrowsing
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/postdata b/chrome/test/data/safe_browsing/old/postdata
deleted file mode 100644
index a049fbb..0000000
--- a/chrome/test/data/safe_browsing/old/postdata
+++ /dev/null
@@ -1,2 +0,0 @@
-goog-malware-shavar;a:8,10,29,38,40-43,63-86,88-115,118-126,128-134,136-142,144-148,150-159,161-168,170-177,179-180,184-186,188-190,192-196,198-211,213-244,246-251,253,262,269-299,301-308,310-313,329-331,333-346,348-366,368-413,415-416,418-419,421-532,534-535,537-539,541-583,585-589,591-617,619-623,625,627-632,634-637,639,645,647-648,650,652,663-664,666-669,673-674,680,684-685,687-688,691-692,695,697,699-701,705,708-711,713-714,716,718,720-727,730-731,734,741,748-751,754-755,760,764,766-767,771-772,776-780,782-784,786,789-790,793,796-799,801-804,806,808,812-814,816-817,820-821,824-826,829-831,833,836-839,841,843-845,847,849-850,852,854-857,861-864,869,871-873,875-878,884-885,888-889,891-893,895-898,900-903,909-914,919,921,923-932,934-941,944-946,949,953-954,958,962,964-967,970-971,974-977,979-981,985-987,989-991,993,1000-1001,1003,1005,1008-1009,1013,1019,1022-1023,1026-1027,1029-1031,1035-1038,1040,1049,1051,1053-1055,1063-1067,1069,1071-1072,1075-1077,1083,1087,1089,1093-1094,1096,1099-1101,1103,1106-1107,1110-1111,1115,1118-1119,1122,1126,1128-1129,1134,1139-1140,1146-1148,1150-1152,1154-1155,1157-1158,1162-1164,1170,1172,1175-1177,1179-1180,1182-1183,1185,1188,1192-1193,1197-1198,1200-1205,1207,1209,1212-1213,1216,1219,1222-1224,1226-1227,1229-1230,1233-1235,1238,1243-1244,1246,1250,1255-1256,1263,1265-1267,1270,1272-1273,1275-1276,1279,1281,1284-1285,1289-1290,1292-1293,1296,1299-1300,1303-1308,1310,1313-1314,1316-1324,1329,1333,1336,1343,1346,1348-1349,1351,1353,1355-1356,1359-1360,1362,1368,1374,1378-1387,1390-1391,1394-1395,1398-1399,1402-1403,1407,1411,1413,1416-1417,1419,1423,1425-1427,1431-1432,1434-1436,1438-1445,1448-1450,1452-1453,1455-1456,1458-1464,1466-1467,1469,1473,1477-1478,1482,1484,1486-1487,1490,1493,1497-1532,1535-1540,1542-1571,1573-1575,1577-1579,1581-1583,1585,1588-1592,1594,1597,1600,1607-1611,1618,1620-1627,1629-1631,1633,1693,1696,1726,1729,1731-1732,1738-1739,1742,1746-1749,1752-1755,1758,1773-1774,1792,1820,1823-1826,1851,1879,1884,1888,1894,1897,1901-1903,1906,1911-1912,1915,1919,1932,1936,1950,1953-1954,1956,1961-1962,1964-1965,1968-1972,1974,1976-1978,1981,1983,1989,1992,2000,2002-2007,2010-2011,2017,2025-2029,2031-2047,2065-2067,2071-2072,2074,2085,2091,2093-2096,2098-2102,2104,2107-2133,2135-2136,2138-2139,2141,2143-2169,2183-2192,2194-2198,2200-2208,2210-2218,2221,2224,2227,2260,2330-2331,2372,2378,2384-2387,2390,2392,2395,2397-2398,2400,2428-2431,2433-2441,2445-2446,2448-2449,2451-2455,2457,2462,2464,2466-2469,2471-2473,2475,2479-2486,2488-2496,2498-2502,2505,2508,2510,2512,2516,2518,2520-2535,2543-2546,2548-2551,2557,2561,2563-2565,2570-2578,2583,2585-2587,2589,2592-2593,2596-2607,2610,2615,2619-2622,2625-2627,2631-2632,2640-2649,2651,2653-2656,2664-2665,2668-2672,2674-2675,2679,2681,2683,2691-2692,2695-2700,2702-2721,2723-2726,2728-2736,2738,2742-2743,2745-2776,2778-2779,2781,2783,2785-2786,2790-2792,2794,2797-2978,2980-3186,3188-3190,3193-3197,3199-3205,3207-3208,3210-3211,3215-3216,3218-3219,3221,3223,3227-3229,3231-3232,3234-3237,3240,3242-3243,3245-3246,3249-3250,3252-3256,3258,3260,3263-3266,3268-3277,3279-3280,3284,3286,3289,3291-3295,3297,3299-3302,3305,3307-3311,3313-3326,3328-3331,3336-3338,3342,3345-3349,3351-3377,3379,3381-3383,3385-3391,3394-3399,3405-3420,3423-3424,3430,3432,3434,3436,3439-3742,3746-3747,3749,3751,3753-3786,3788-3789,3791-3792,3794-3803,3805-3809,3813-3918,3920,3922,3924,3926-3927,3929-3933,3935-3939,3941,3943-3945,3947-3957,3960-3961,3963-3966,3968-3970,3972-3973,3976,3978-3981,3983-4003,4005,4007-4008,4011-4023,4025,4027-4032,4034-4045,4047-4062,4065,4068-4070,4072-4073,4075-4080,4082-4083,4085-4095,4097-4100,4104-4114,4116-4122,4124-4127,4129-4141,4143-4149,4151-4159,4161-4170,4172-4197:s:1-3940
-goog-phish-shavar;a:27,60,79,90,93,105-106,3257,3331-3332,3338-3339,3347-3349,3351,3356-3358,3371,3442,3475,3478,3491,3498,3517,3576,3590-3591,3600-3602,3612,3715,3722-3723,3728,3733,3853,3997,4041-4043,4111,4152,4173-4174,4243,4258,4260,4275,4279,4305,4323,4330,4386,4403,4415,4520,4556,4562,4660-4661,4669,4679-4680,4684,4741,4814,4816,4822,4933,4938,4940,4961,4964,5068,5079,5081,5084,5110-5111,5116,5140,5193,5222,5236,5250,5313,5328,5351,5353,5358,5394-5395,5412,5444,5461-5463,5466-5467,5470,5475,5518-5519,5574,5587,5623,5714-5715,5730-5731,5734,5772,5810,5877,5939,5955,5957,6028,6039,6076,6084,6089,6120,6122,6147,6165,6177,6233,6280,6286,6364,6391,6407-6408,6429,6479,6508-6509,6537,6541,6551,6553,6572-6574,6576,6578-6580,6582-6583,6585-6587,6589-6598,6600,6603-6605,6607-6613,6615,6617-6618,6620-6625,6627-6632,6634-6635,6637-6638,6641-6642,6644-6649,6651-6652,6655-6657,6659,6661-6668,6670-6693,6695,6697-6699,6701-6706,6708-6728,6730-6732,6734,6736-6752,6754-6757,6759-6798,6800-6830,6832-6838,6840,6842-6844,6846-6852,6854,6856-6865,6867-6869,6872-6876,6878,6880-6886,6888-6910,6912,6914-6916,6918-6933,6935-6950,6953-6954,6957-6959,6963,6965-6977,6979-6980,6982-6992,6994-6999,7001-7008,7010-7012,7014-7023,7025-7027,7029-7037,7039-7063,7065-7078,7080-7084,7087-7088,7090-7106,7108-7116,7118-7121,7123,7126-7134,7136-7142,7144-7150,7152-7159,7161-7173,7175-7188,7191-7192,7194-7200,7202-7207,7209-7221,7223-7226,7228-7230,7232-7234,7236-7246,7248-7252,7255-7259,7261-7262,7264-7276,7278-7280,7282-7284,7286-7291,7293-7300,7302-7328,7330-7336,7338-7341,7343-7347,7349-7369,7371-7375,7377-7379,7381-7390,7396-7401,7403-7404,7406,7409-7410,7412-7414,7417-7427,7429-7430,7432-7435,7437-7443,7445-7447,7449-7451,7453-7456,7458,7460,7462-7477,7480-7489,7491,7493-7495,7497-7498,7500-7501,7503,7505,7507-7510,7512-7513,7515-7520,7522-7531,7533-7537,7540-7549,7551-7552,7554,7556,7558-7561,7563-7585,7587-7590,7593-7595,7597,7599-7608,7610-7612,7614-7616,7618-7624,7626,7628-7635,7637-7638,7640-7648,7650-7653,7655-7660,7662-7684,7686-7723,7726-7750,7752-7757,7759-7765,7768-7783,7786-7789,7791-7805,7807-7809,7811-7813,7815-7821,7823-7841,7843-7857,7859-7870,7872,7874-7876,7878-7879,7881,7883-7891,7893-7897,7899-7902,7904-7906,7908-7918,7920-7926,7928-7946,7948-8008,8010-8016,8018-8019,8021-8024,8026-8029,8031,8033-8045,8048-8049,8051-8087,8089-8134,8136-8146,8148-8152,8155-8195,8197-8215,8217-8219,8221-8222,8224-8259,8261-8263,8266-8282,8284-8287,8289-8292,8294,8296-8297,8300-8302,8304-8307,8309-8335,8337-8339,8341-8356,8358-8359,8361-8391,8393-8399,8402,8404-8409,8412-8419,8421-8425,8427,8431-8433,8435-8439,8441-8443,8446,8448-8464,8466,8468-8469,8471-8478,8480-8497,8499-8500,8502-8504,8506-8507,8510-8511,8513-8517,8519-8522,8524-8525,8527-8531,8533,8538-8539,8541-8546,8548-8552,8554-8570,8572,8574-8576,8578,8580-8597,8599-8619,8621-8638,8640-8661,8663-8684,8686-8689,8691-8706,8708-8731,8733-8736,8738-8762,8764-8777,8779-8782,8785-8788,8790-8797,8799-8801,8803-8813,8815-8833,8835-8837,8839-8848,8851-8856,8858-8867,8869-8890,8892-8893,8895-8899,8901-8915,8919-8925,8927,8932,8936-8940,8942-8943,8946,8948-8949,8951-8952,8955,8957,8959-8967,8970-8973,8975-8990,8992-8997,8999-9015,9017-9018,9020-9023,9025-9028,9030-9032,9034-9038,9040-9041,9044-9053,9055,9057-9058,9060-9127,9129-9138,9140-9142,9144-9150,9152,9154-9169,9171,9173-9178,9181-9183,9185-9197,9199-9202,9205-9209,9211-9212,9214-9215,9218-9219,9221-9232,9234-9238,9240-9278,9280-9287,9289,9291,9293-9303,9305-9306,9308-9310,9313-9315,9317-9321,9323-9326,9328-9331,9333,9335,9337,9339-9341,9343-9349,9352-9353,9355,9357-9362,9364-9367,9370-9382,9384-9401,9404-9406,9408-9411,9413-9424,9426-9444,9446-9448,9450-9465,9468-9471,9473-9475,9477,9479-9483,9486-9489,9491-9500,9502-9530,9532-9533,9535-9553,9555-9595,9597-9601,9603-9604,9606-9623,9625-9646,9648-9675,9677-9681,9683-9690,9692-9693,9695-9699,9701-9737,9739-9803,9805-9825,9827-9850,9852-9868,9870-9900,9902-9938,9940-9981,9983-10012,10014-10080,10082-10092,10094-10098,10100-10109,10111-10123,10125-10140,10142-10158,10160-10174,10176-10217,10219-10226,10228-10234,10236-10238,10241-10251,10253-10267,10271-10284,10286-10300,10302-10303,10305-10314,10316-10318,10320-10321,10323-10327,10329-10337,10339-10344,10346-10359,10361-10366,10368-10393,10395-10424,10426-10463,10465-10467,10470-10481,10484-10498,10501-10548,10550-10575,10578-10589,10591-10705,10707-10722,10724-10733,10735-10739,10741-10758,10760-10781,10783-10873,10875-10929,10931-10994,10996-11004,11006-11029,11031-11039,11041-11067:s:1-2045,2051-2060,2066-2100,2106-2110,2116-2145,2151-2160,2171-2180,2196-2260,2266-2280,2286-2325,2331-9209
diff --git a/chrome/test/data/safe_browsing/old/response b/chrome/test/data/safe_browsing/old/response
deleted file mode 100644
index 9e8dc94..0000000
--- a/chrome/test/data/safe_browsing/old/response
+++ /dev/null
@@ -1,48 +0,0 @@
-n:1835
-i:goog-malware-shavar
-ad:8,38,40-43,67,75,105,112-113,141,148,196,250-251,253,277,280,289,340,368,371,409,425,475,507,575,609,614,632,637,668,673,691,695,697,701,709-711,714,718,720-722,725-727,734,748,750,764,766,772,776,790,798-799,801,813,816,836,838-839,850,855,862,864,872,892,898,911,941,987,1001,1023,1026,1029,1031,1065,1069,1087,1094,1100,1107,1111,1115,1126,1129,1158,1172,1177,1182,1198,1202-1203,1219,1224,1230,1233-1234,1244,1265,1267,1275,1304,1314,1343,1346,1356,1359-1360,1368,1374,1391,1411,1413,1417,1427,1436,1444-1445,1452-1453,1455-1456,1459-1460,1462,1477,1484,1493,1510,1512,1539,1546,1554,1574,1594,1629,1726,1748,1753-1754,1774,1792,1824-1826,1884,1894,1897,1901-1903,1906,1974,1983,2026,2029,2036-2037,2041,2043,2045,2065,2116,2186,2192,2200,2204,2217-2218,2433,2437,2453,2455,2462,2464,2510,2535,2543,2546,2557,2585,2587,2592,2596-2597,2615,2645-2646,2691-2692,2698-2699,2711,2723,2753,2768-2769,2771,2783,2792,2794,2819,2842,2911,3032,3197,3208,3216,3221,3229,3234,3236-3237,3242,3255,3258,3265,3272-3274,3280,3286,3291-3294,3305,3328,3394,3423,3434,3746,3754,3785-3786,3797,3799,3806-3807,3896,3914,3917,3924,3927,3937,3941,3945,3952,3957,3969,3978-3979,3981,3984-3986,3991,3993,4015,4020-4022,4029-4030,4034,4038,4048,4051-4054,4069,4072,4076,4078,4080,4082,4085,4088-4089,4094,4104,4107,4114,4119-4121,4124,4126,4129,4131,4135,4139,4147,4152-4153,4158-4159,4163-4165,4167,4169,4178,4180,4182,4184,4187,4189-4191
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_3921-4000:3921-4000
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4001-4080:4001-4080
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4081-4160:4081-4160
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4161-4240:4161-4240
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4241-4280:4241-4280
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4281-4320:4281-4320
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4321-4400:4321-4400
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_s_4401-4480:4401-4418
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_a_4161-4320:4161-4162,4166,4168,4170,4172-4177,4179,4181,4183,4185-4186,4188,4192-4198,4208-4215,4219,4221-4224,4226-4231,4233-4235,4240-4242,4244-4246,4248-4251,4253-4262,4265-4269,4272,4274,4276-4279,4281-4283,4285-4289,4291-4300,4302-4303,4305-4311,4313-4314,4316,4318-4320
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_a_4321-4480:4321-4324,4326-4342,4344-4347,4349-4352,4354,4356,4358-4373,4375-4381,4383-4386,4389-4394,4396-4399,4401-4407,4409-4411,4413,4416-4423,4425-4426,4428,4430-4435,4438-4446,4448-4456,4458-4464,4466-4477,4479-4480
-u:s.ytimg.com/safebrowsing/rd/goog-malware-shavar_a_4481-4640:4481-4503,4505-4513,4515-4518,4520-4530
-i:goog-phish-shavar
-ad:27,60,90,93,105-106,3257,3331-3332,3338-3339,3347-3349,3351,3356-3358,3371,3442,3475,3478,3491,3498,3517,3576,3590-3591,3600-3602,3612,3715,3722-3723,3728,3733,3853,3997,4041-4043,4111,4152,4173-4174,4243,4258,4260,4275,4279,4305,4323,4330,4386,4403,4415,4520,4556,4562,4660-4661,4669,4679-4680,4684,4741,4814,4816,4822,4933,4938,4940,4961,4964,5068,5079,5081,5084,5110-5111,5116,5140,5193,5222,5236,5250,5328,5351,5353,5358,5394-5395,5412,5444,5461-5463,5466-5467,5470,5475,5518-5519,5574,5587,5623,5714,5730-5731,5734,5772,5955,6028,6076,6089,6165,6177,6280,6479,6551,6553,6572-6574,6576,6578-6580,6582-6583,6585-6587,6589-6598,6600,6603-6605,6607-6613,6615,6617-6618,6620-6625,6627-6632,6634-6635,6637-6638,6641-6642,6644-6649,6651-6652,6655-6657,6659,6661-6668,6670-6679,6681-6693,6695,6697-6699,6701-6706,6708-6727,6730-6732,6734,6736-6740,6742-6745,6747-6752,6755-6757,6759-6768,6770-6798,6800-6830,6832-6838,6840,6842-6844,6846-6852,6854,6856-6865,6867-6869,6872-6876,6878,6880-6886,6888-6901,6903,6905-6906,6908-6910,6912,6915,6919-6933,6935-6942,6944-6950,6953-6954,6957-6959,6963,6965-6977,6979-6980,6982-6992,6994-6999,7001,7004-7007,7012,7014-7023,7025-7027,7029-7032,7034-7037,7039-7040,7043,7045,7047,7049-7057,7061-7063,7065-7078,7080-7084,7087-7088,7090-7106,7108-7116,7118-7121,7123,7126-7130,7132,7136-7142,7146-7150,7152-7159,7161-7163,7165-7170,7172,7175-7179,7181-7188,7191-7192,7194-7200,7202-7207,7209-7219,7221,7223-7226,7228-7230,7232-7234,7236,7238-7246,7248-7252,7255-7257,7259,7261-7262,7265,7267-7276,7278-7280,7282-7284,7287,7289-7291,7293-7300,7302-7306,7308,7310-7328,7330-7336,7338-7341,7343,7345-7347,7349-7369,7371-7375,7377-7379,7381-7390,7396-7401,7403-7404,7406,7409-7410,7412-7414,7417-7427,7429-7430,7432-7435,7437-7443,7445-7447,7449-7451,7453-7456,7458,7460,7462-7477,7480-7489,7493-7495,7497-7498,7500-7501,7503,7505,7507-7509,7512-7513,7515-7517,7519-7520,7522-7526,7528-7531,7533-7537,7540-7549,7551-7552,7554,7556,7558-7561,7563-7585,7587-7590,7593-7595,7597,7599-7608,7610-7612,7614-7616,7618-7624,7626,7628-7629,7631-7632,7634,7638,7640-7648,7650-7651,7653,7655-7660,7662-7675,7678-7684,7686-7723,7726-7736,7739-7750,7752-7757,7759-7765,7768-7775,7777-7783,7786-7789,7791-7805,7807-7809,7811-7813,7815-7821,7823-7841,7843-7857,7859-7870,7872,7874-7876,7878-7879,7881,7883-7887,7889-7891,7893-7897,7899-7902,7904-7906,7908-7909,7911-7913,7915,7917-7918,7920-7925,7928-7946,7948-8008,8010-8016,8018-8019,8021-8024,8026-8029,8031,8033-8045,8048-8049,8052-8087,8089-8134,8136-8146,8148-8152,8155-8176,8178-8179,8181-8195,8197-8215,8217-8219,8221-8222,8224-8234,8236-8259,8261-8263,8266-8282,8284-8287,8289-8292,8294,8296-8297,8300-8302,8304-8307,8309-8335,8337-8339,8341,8343-8356,8358-8359,8361-8391,8393-8399,8402,8404-8409,8412-8419,8421-8425,8427,8431-8433,8435-8439,8441-8443,8446,8448-8464,8466,8468-8469,8471-8478,8480-8497,8499-8500,8502-8504,8506-8507,8510-8511,8513-8517,8519-8522,8524-8525,8527-8531,8533,8538-8539,8541-8543,8545-8546,8548-8552,8554-8562,8564-8570,8572,8574-8576,8578,8580-8597,8599-8619,8621-8636,8638,8640-8661,8663-8674,8676-8684,8686-8689,8691-8701,8703,8705-8706,8708-8712,8714-8729,8731,8733-8736,8738-8743,8746-8762,8764-8777,8779-8782,8785-8788,8790-8795,8797,8799-8801,8803-8813,8815-8821,8823-8824,8826-8833,8835-8837,8839-8848,8851-8856,8859,8861-8867,8869-8890,8892-8893,8895-8899,8901-8915,8919-8925,8927,8932,8936-8940,8942-8943,8946,8949,8952,8955,8957,8960-8961,8963-8967,8970-8973,8975-8990,8992-8995,8999-9012,9014-9015,9020-9021,9023,9025-9028,9030-9032,9034-9038,9040-9041,9045,9065,9073,9079,9100-9101,9107,9169,9187,9189,9193,9205,9215,9229-9230,9232,9234-9235,9241,9249,9253,9274,9276,9293,9333,9349,9373,9377,9382,9392,9394,9457,9528,9544,9558,9569,9572,9606,9677,9722,9748,9757,9808,9821,9866,9888,9891,9895,9916,9935,9957,9965,9969,9979,9986,10002,10005,10007,10023,10033,10051,10076,10078,10080,10098,10111,10193,10213-10214,10222,10224,10230,10237,10250,10272,10279,10434,10456,10481,10527,10584,10732,10813,10844-10845,10852,10911,10913,10956,10969,10982,10994,11008,11017,11032,11035,11055-11056,11058-11059,11064
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9121-9280:9121-9280
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9281-9440:9281-9440
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9441-9600:9441-9600
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9601-9760:9601-9760
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9761-9920:9761-9920
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_9921-10080:9921-10080
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10081-10240:10081-10240
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10241-10400:10241-10303,10305-10306,10308-10309,10311-10313,10316-10323,10325-10335,10337-10344,10346,10349-10351,10353,10356-10361,10363-10370,10372-10373,10375-10378,10380-10394,10396-10399
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10401-10405:10401-10405
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10411-10415:10411-10415
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10426-10430:10426-10430
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10431-10435:10432-10435
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10436-10440:10436,10438-10440
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10441-10460:10441-10445,10447,10449-10456,10458-10459
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10461-10465:10461-10463,10465
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10481-10485:10481,10483-10485
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10491-10495:10491,10493-10494
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10501-10520:10501-10502,10506-10510,10513-10520
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10521-10525:10521-10525
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10531-10535:10531-10535
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10536-10540:10536-10540
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10546-10550:10546,10548-10550
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10551-10555:10551-10555
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10561-10720:10561-10568,10571-10578,10580-10600,10602-10610,10612-10614,10616-10618,10620-10630,10632-10636,10638-10644,10646-10647,10649-10660,10662-10665,10667-10673,10675,10677-10694,10696-10697,10699-10704,10708-10709,10711-10719
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10721-10880:10721,10723-10726,10728-10730,10732,10734-10736,10738,10741-10753,10755-10756,10758,10760-10761,10763-10767,10770,10772-10774,10776-10777,10780-10781,10783-10790,10792-10816,10818-10824,10826-10828,10830-10848,10851-10853,10855-10856,10858-10862,10864,10866-10880
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_10881-11040:10881-10915,10917-10921,10923-10924,10926-10927,10929-10935,10937-10949,10951-10952,10954-11012,11014-11040
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_s_11041-11200:11041,11043-11046,11048-11086
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_12801-12960:12801-12814,12816-12827,12830-12833,12835-12870,12873-12878,12880-12883,12885-12888,12890-12932,12934-12937,12939-12944,12946-12953,12955-12957,12959-12960
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_12961-13120:12961,12963-12969,12971-12973,12975-13012,13014-13048,13050-13076,13078-13120
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_13121-13280:13121-13169,13171-13188,13190-13196,13198-13207,13209-13280
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_13281-13440:13281-13392,13394-13406,13408-13440
-u:s.ytimg.com/safebrowsing/rd/goog-phish-shavar_a_13441-13600:13441-13453,13455-13511,13513-13596
diff --git a/chrome/test/data/safe_browsing/old/updates/000goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/000goog-malware-shavar_s
deleted file mode 100644
index c13fbc3..0000000
--- a/chrome/test/data/safe_browsing/old/updates/000goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/001goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/001goog-malware-shavar_s
deleted file mode 100644
index 8e30acb..0000000
--- a/chrome/test/data/safe_browsing/old/updates/001goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/002goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/002goog-malware-shavar_s
deleted file mode 100644
index 58ccc45..0000000
--- a/chrome/test/data/safe_browsing/old/updates/002goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/003goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/003goog-malware-shavar_s
deleted file mode 100644
index ebca6c6..0000000
--- a/chrome/test/data/safe_browsing/old/updates/003goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/004goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/004goog-malware-shavar_s
deleted file mode 100644
index 83762db..0000000
--- a/chrome/test/data/safe_browsing/old/updates/004goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/005goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/005goog-malware-shavar_s
deleted file mode 100644
index e815f48..0000000
--- a/chrome/test/data/safe_browsing/old/updates/005goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/006goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/006goog-malware-shavar_s
deleted file mode 100644
index 67aaa32..0000000
--- a/chrome/test/data/safe_browsing/old/updates/006goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/007goog-malware-shavar_s b/chrome/test/data/safe_browsing/old/updates/007goog-malware-shavar_s
deleted file mode 100644
index bfdf3ae0..0000000
--- a/chrome/test/data/safe_browsing/old/updates/007goog-malware-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/008goog-malware-shavar_a b/chrome/test/data/safe_browsing/old/updates/008goog-malware-shavar_a
deleted file mode 100644
index 567036e..0000000
--- a/chrome/test/data/safe_browsing/old/updates/008goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/009goog-malware-shavar_a b/chrome/test/data/safe_browsing/old/updates/009goog-malware-shavar_a
deleted file mode 100644
index 530176e..0000000
--- a/chrome/test/data/safe_browsing/old/updates/009goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/010goog-malware-shavar_a b/chrome/test/data/safe_browsing/old/updates/010goog-malware-shavar_a
deleted file mode 100644
index 86aeae0..0000000
--- a/chrome/test/data/safe_browsing/old/updates/010goog-malware-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/011goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/011goog-phish-shavar_s
deleted file mode 100644
index b5f45ac..0000000
--- a/chrome/test/data/safe_browsing/old/updates/011goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/012goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/012goog-phish-shavar_s
deleted file mode 100644
index f290c4c..0000000
--- a/chrome/test/data/safe_browsing/old/updates/012goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/013goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/013goog-phish-shavar_s
deleted file mode 100644
index 4fd80ca..0000000
--- a/chrome/test/data/safe_browsing/old/updates/013goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/014goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/014goog-phish-shavar_s
deleted file mode 100644
index 1d4aaf5..0000000
--- a/chrome/test/data/safe_browsing/old/updates/014goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/015goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/015goog-phish-shavar_s
deleted file mode 100644
index 1239e9d..0000000
--- a/chrome/test/data/safe_browsing/old/updates/015goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/016goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/016goog-phish-shavar_s
deleted file mode 100644
index c6ed638..0000000
--- a/chrome/test/data/safe_browsing/old/updates/016goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/017goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/017goog-phish-shavar_s
deleted file mode 100644
index 7f6b873..0000000
--- a/chrome/test/data/safe_browsing/old/updates/017goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/018goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/018goog-phish-shavar_s
deleted file mode 100644
index 376cc76..0000000
--- a/chrome/test/data/safe_browsing/old/updates/018goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/019goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/019goog-phish-shavar_s
deleted file mode 100644
index 77a5f13..0000000
--- a/chrome/test/data/safe_browsing/old/updates/019goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/020goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/020goog-phish-shavar_s
deleted file mode 100644
index b30ea59..0000000
--- a/chrome/test/data/safe_browsing/old/updates/020goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/021goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/021goog-phish-shavar_s
deleted file mode 100644
index 19fc988..0000000
--- a/chrome/test/data/safe_browsing/old/updates/021goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/022goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/022goog-phish-shavar_s
deleted file mode 100644
index e2b1119..0000000
--- a/chrome/test/data/safe_browsing/old/updates/022goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/023goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/023goog-phish-shavar_s
deleted file mode 100644
index e0981c9..0000000
--- a/chrome/test/data/safe_browsing/old/updates/023goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/024goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/024goog-phish-shavar_s
deleted file mode 100644
index 40da8ddf..0000000
--- a/chrome/test/data/safe_browsing/old/updates/024goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/025goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/025goog-phish-shavar_s
deleted file mode 100644
index 1192843..0000000
--- a/chrome/test/data/safe_browsing/old/updates/025goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/026goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/026goog-phish-shavar_s
deleted file mode 100644
index d46be87..0000000
--- a/chrome/test/data/safe_browsing/old/updates/026goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/027goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/027goog-phish-shavar_s
deleted file mode 100644
index c0bd6fe..0000000
--- a/chrome/test/data/safe_browsing/old/updates/027goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/028goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/028goog-phish-shavar_s
deleted file mode 100644
index db057c3..0000000
--- a/chrome/test/data/safe_browsing/old/updates/028goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/029goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/029goog-phish-shavar_s
deleted file mode 100644
index 9aab307..0000000
--- a/chrome/test/data/safe_browsing/old/updates/029goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/030goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/030goog-phish-shavar_s
deleted file mode 100644
index 81d3e0d..0000000
--- a/chrome/test/data/safe_browsing/old/updates/030goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/031goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/031goog-phish-shavar_s
deleted file mode 100644
index ed17d3d..0000000
--- a/chrome/test/data/safe_browsing/old/updates/031goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/032goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/032goog-phish-shavar_s
deleted file mode 100644
index f3bf19d..0000000
--- a/chrome/test/data/safe_browsing/old/updates/032goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/033goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/033goog-phish-shavar_s
deleted file mode 100644
index bdc5225..0000000
--- a/chrome/test/data/safe_browsing/old/updates/033goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/034goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/034goog-phish-shavar_s
deleted file mode 100644
index 7484012..0000000
--- a/chrome/test/data/safe_browsing/old/updates/034goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/035goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/035goog-phish-shavar_s
deleted file mode 100644
index b47101a..0000000
--- a/chrome/test/data/safe_browsing/old/updates/035goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/036goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/036goog-phish-shavar_s
deleted file mode 100644
index b968557..0000000
--- a/chrome/test/data/safe_browsing/old/updates/036goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/037goog-phish-shavar_s b/chrome/test/data/safe_browsing/old/updates/037goog-phish-shavar_s
deleted file mode 100644
index 9b4c333..0000000
--- a/chrome/test/data/safe_browsing/old/updates/037goog-phish-shavar_s
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/038goog-phish-shavar_a b/chrome/test/data/safe_browsing/old/updates/038goog-phish-shavar_a
deleted file mode 100644
index 1010871..0000000
--- a/chrome/test/data/safe_browsing/old/updates/038goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/039goog-phish-shavar_a b/chrome/test/data/safe_browsing/old/updates/039goog-phish-shavar_a
deleted file mode 100644
index 666eeba..0000000
--- a/chrome/test/data/safe_browsing/old/updates/039goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/040goog-phish-shavar_a b/chrome/test/data/safe_browsing/old/updates/040goog-phish-shavar_a
deleted file mode 100644
index 435c037..0000000
--- a/chrome/test/data/safe_browsing/old/updates/040goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/041goog-phish-shavar_a b/chrome/test/data/safe_browsing/old/updates/041goog-phish-shavar_a
deleted file mode 100644
index e13aab7..0000000
--- a/chrome/test/data/safe_browsing/old/updates/041goog-phish-shavar_a
+++ /dev/null
diff --git a/chrome/test/data/safe_browsing/old/updates/042goog-phish-shavar_a b/chrome/test/data/safe_browsing/old/updates/042goog-phish-shavar_a
deleted file mode 100644
index 7179c57..0000000
--- a/chrome/test/data/safe_browsing/old/updates/042goog-phish-shavar_a
+++ /dev/null