Revert of Move more declarations from c/b/sb/sb_util.h to components.

components/safe_browsing_db/prefix_set_unittest.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 "components/safe_browsing_db/prefix_set.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "components/safe_browsing_db/util.h"
+#include "components/safe_browsing_db/safe_browsing_db_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace {
 
 const SBPrefix kHighBitClear = 1000u * 1000u * 1000u;
 const SBPrefix kHighBitSet = 3u * 1000u * 1000u * 1000u;
 
 }  // namespace
 
@@ skipping 686 matching lines @@
   const SBFullHash kHash2 = SBFullHashForString("www.evil.com/phishing.html");
 
   EXPECT_TRUE(prefix_set->Exists(kHash1));
   EXPECT_TRUE(prefix_set->Exists(kHash2));
   EXPECT_FALSE(prefix_set->PrefixExists(kHash1.prefix));
   EXPECT_FALSE(prefix_set->PrefixExists(kHash2.prefix));
 }
 #endif
 
 }  // namespace safe_browsing