Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync_bookmarks/bookmark_model_associator.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_bookmarks/bookmark_model_associator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 288 matching lines @@
   return syncer_merge_result_->pre_association_version();
 }
 
 void BookmarkModelAssociator::Context::MarkForVersionUpdate(
     const bookmarks::BookmarkNode* node) {
   bookmarks_for_version_update_.push_back(node);
 }
 
 BookmarkModelAssociator::BookmarkModelAssociator(
     BookmarkModel* bookmark_model,
-    syncer::SyncClient* sync_client,
+    sync_driver::SyncClient* sync_client,
     syncer::UserShare* user_share,
     std::unique_ptr<syncer::DataTypeErrorHandler> unrecoverable_error_handler,
     bool expect_mobile_bookmarks_folder)
     : bookmark_model_(bookmark_model),
       sync_client_(sync_client),
       user_share_(user_share),
       unrecoverable_error_handler_(std::move(unrecoverable_error_handler)),
       expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder),
       weak_factory_(this) {
   DCHECK(bookmark_model_);
@@ skipping 687 matching lines @@
                                  syncer::BOOKMARKS);
       } else {
         context->set_native_model_sync_state(BEHIND);
       }
     }
   }
   return syncer::SyncError();
 }
 
 }  // namespace sync_bookmarks