[Sync] Move DataTypeErrorHandler to //sync.

components/browser_sync/browser/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 20 matching lines @@
 #include "build/build_config.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/browser_sync/browser/profile_sync_test_util.h"
 #include "components/sync_bookmarks/bookmark_change_processor.h"
 #include "components/sync_bookmarks/bookmark_model_associator.h"
-#include "components/sync_driver/data_type_error_handler.h"
-#include "components/sync_driver/data_type_error_handler_mock.h"
 #include "components/sync_driver/fake_sync_client.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_merge_result.h"
 #include "sync/internal_api/public/change_record.h"
+#include "sync/internal_api/public/data_type_error_handler.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
+#include "sync/internal_api/public/test/data_type_error_handler_mock.h"
 #include "sync/internal_api/public/test/test_user_share.h"
 #include "sync/internal_api/public/write_node.h"
 #include "sync/internal_api/public/write_transaction.h"
 #include "sync/internal_api/syncapi_internal.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_id.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/syncable/syncable_write_transaction.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 725 matching lines @@
     return change_processor_.get();
   }
 
   void delete_change_processor() { change_processor_.reset(); }
 
   void ResetChangeProcessor() {
     change_processor_ = base::WrapUnique(new BookmarkChangeProcessor(
         sync_client_.get(), model_associator_.get(), &mock_error_handler_));
   }
 
-  sync_driver::DataTypeErrorHandlerMock* mock_error_handler() {
+  syncer::DataTypeErrorHandlerMock* mock_error_handler() {
     return &mock_error_handler_;
   }
 
   void delete_model_associator() { model_associator_.reset(); }
 
   BookmarkModelAssociator* model_associator() {
     return model_associator_.get();
   }
 
   bookmarks::ManagedBookmarkService* managed_bookmark_service() {
     return managed_bookmark_service_.get();
   }
 
  private:
   base::ScopedTempDir data_dir_;
   base::MessageLoop message_loop_;
   browser_sync::ProfileSyncServiceBundle profile_sync_service_bundle_;
 
   std::unique_ptr<sync_driver::FakeSyncClient> sync_client_;
   std::unique_ptr<BookmarkModel> model_;
   syncer::TestUserShare test_user_share_;
   std::unique_ptr<BookmarkChangeProcessor> change_processor_;
-  StrictMock<sync_driver::DataTypeErrorHandlerMock> mock_error_handler_;
+  StrictMock<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_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncServiceBookmarkTest);
 };
 
 TEST_F(ProfileSyncServiceBookmarkTest, InitialState) {
@@ skipping 1760 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