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

components/safe_browsing_db/prefix_set.h

 // 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.
 //
 // A read-only set implementation for |SBPrefix| items.  Prefixes are
 // sorted and stored as 16-bit deltas from the previous prefix.  An
 // index structure provides quick random access, and also handles
 // cases where 16 bits cannot encode a delta.
 //
 // For example, the sequence {20, 25, 41, 65432, 150000, 160000} would
@@ skipping 37 matching lines @@
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_
 #define COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_
 
 #include <utility>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/safe_browsing_db/safe_browsing_db_util.h"
+#include "components/safe_browsing_db/util.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace safe_browsing {
 
 class PrefixSet {
  public:
   ~PrefixSet();
@@ skipping 109 matching lines @@
   // Buffers prefixes until enough are avaliable to emit a run.
   std::vector<SBPrefix> buffer_;
 
   // The PrefixSet being built.
   scoped_ptr<PrefixSet> prefix_set_;
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_