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

components/browser_sync/profile_sync_service_bookmark_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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 248 matching lines @@
                       const BookmarkNode::MetaInfoMap& meta_info_map) {
     syncer::WriteNode node(trans_);
     ASSERT_EQ(BaseNode::INIT_OK, node.InitByIdLookup(id));
     sync_pb::BookmarkSpecifics specifics = node.GetBookmarkSpecifics();
     SetNodeMetaInfo(meta_info_map, &specifics);
     node.SetBookmarkSpecifics(specifics);
     SetModified(id);
   }
 
   // Pass the fake change list to |service|.
-  void ApplyPendingChanges(syncer::ChangeProcessor* processor) {
+  void ApplyPendingChanges(sync_driver::ChangeProcessor* processor) {
     processor->ApplyChangesFromSyncModel(
         trans_, 0, syncer::ImmutableChangeRecordList(&changes_));
   }
 
   const syncer::ChangeRecordList& changes() { return changes_; }
 
  private:
   // Helper function to push an ACTION_UPDATE record onto the back
   // of the changelist.
   void SetModified(int64_t id) {
@@ skipping 530 matching lines @@
 
   bookmarks::ManagedBookmarkService* managed_bookmark_service() {
     return managed_bookmark_service_.get();
   }
 
  private:
   base::TestMessageLoop message_loop_;
   base::ScopedTempDir data_dir_;
   ProfileSyncServiceBundle profile_sync_service_bundle_;
 
-  std::unique_ptr<syncer::FakeSyncClient> sync_client_;
+  std::unique_ptr<sync_driver::FakeSyncClient> sync_client_;
   std::unique_ptr<BookmarkModel> model_;
   syncer::TestUserShare test_user_share_;
   std::unique_ptr<BookmarkChangeProcessor> change_processor_;
   syncer::DataTypeErrorHandlerMock* mock_error_handler_;
   std::unique_ptr<BookmarkModelAssociator> model_associator_;
   std::unique_ptr<bookmarks::ManagedBookmarkService> managed_bookmark_service_;
 
   syncer::SyncMergeResult local_merge_result_;
   syncer::SyncMergeResult syncer_merge_result_;
 
@@ skipping 1761 matching lines @@
   EXPECT_EQ(syncer::kInvalidId, sync_id);
 
   // Verify that Sync ignores deleting this node.
   model()->Remove(node);
   EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount());
 }
 
 }  // namespace
 
 }  // namespace browser_sync