[Sync] Move GenerateSyncableHash to base.

components/sync/syncable/directory_backing_store.cc

 // Copyright 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/sync/syncable/directory_backing_store.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <unordered_set>
 #include <utility>
 
 #include "base/base64.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
+#include "components/sync/base/hash_util.h"
 #include "components/sync/base/node_ordinal.h"
 #include "components/sync/base/time.h"
 #include "components/sync/protocol/bookmark_specifics.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 #include "components/sync/syncable/syncable_columns.h"
 #include "components/sync/syncable/syncable_id.h"
-#include "components/sync/syncable/syncable_util.h"
 #include "sql/error_delegate_util.h"
 #include "sql/transaction.h"
 
 using std::string;
 
 namespace syncer {
 namespace syncable {
 
 // Increment this version whenever updating DB tables.
 const int32_t kCurrentDBVersion = 90;
@@ skipping 1335 matching lines @@
     // We only maintain positions for bookmarks that are not server-defined
     // top-level folders.
     UniquePosition position;
     if (GetModelTypeFromSpecifics(specifics) == BOOKMARKS
         && !(is_dir && !server_unique_tag.empty())) {
       if (id_string.at(0) == 'c') {
         // We found an uncommitted item.  This is rare, but fortunate.  This
         // means we can set the bookmark tag according to the originator client
         // item ID and originator cache guid, because (unlike the other case) we
         // know that this client is the originator.
-        unique_bookmark_tag = syncable::GenerateSyncableBookmarkHash(
-            cache_guid,
-            id_string.substr(1));
+        unique_bookmark_tag =
+            GenerateSyncableBookmarkHash(cache_guid, id_string.substr(1));
       } else {
         // If we've already committed the item, then we don't know who the
         // originator was.  We do not have access to the originator client item
         // ID and originator cache guid at this point.
         //
         // We will base our hash entirely on the server ID instead.  This is
         // incorrect, but at least all clients that undergo this migration step
         // will be incorrect in the same way.
         //
         // To get everyone back into a synced state, we will update the bookmark
         // tag according to the originator_cache_guid and originator_item_id
         // when we see updates for this item.  That should ensure that commonly
         // modified items will end up with the proper tag values eventually.
-        unique_bookmark_tag = syncable::GenerateSyncableBookmarkHash(
+        unique_bookmark_tag = GenerateSyncableBookmarkHash(
             std::string(),  // cache_guid left intentionally blank.
             id_string.substr(1));
       }
 
       int64_t int_position = NodeOrdinalToInt64(ordinal);
       position = UniquePosition::FromInt64(int_position, unique_bookmark_tag);
     } else {
       // Leave bookmark_tag and position at their default (invalid) values.
     }
 
@@ skipping 347 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(!catastrophic_error_handler.is_null());
   catastrophic_error_handler_ = catastrophic_error_handler;
   sql::Connection::ErrorCallback error_callback =
       base::Bind(&OnSqliteError, catastrophic_error_handler_);
   db_->set_error_callback(error_callback);
 }
 
 }  // namespace syncable
 }  // namespace syncer