[Sync] Move DataTypeErrorHandler to //sync.

components/sync_driver/shared_change_processor.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_SHARED_CHANGE_PROCESSOR_H_
 #define COMPONENTS_SYNC_DRIVER_SHARED_CHANGE_PROCESSOR_H_
 
 #include <string>
 
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
-#include "components/sync_driver/data_type_error_handler.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/api/sync_merge_result.h"
+#include "sync/internal_api/public/data_type_error_handler.h"
 #include "sync/internal_api/public/engine/model_safe_worker.h"
 
 namespace syncer {
+class DataTypeErrorHandler;

[pavely, 2016/05/11 18:29:04]

Could you remove either include or forward-declare?

[maxbogue, 2016/05/11 19:03:02]

Done.

 class SyncableService;
 struct UserShare;
 }  // namespace syncer
 
 namespace sync_driver {
 
 class ChangeProcessor;
 class GenericChangeProcessor;
 class GenericChangeProcessorFactory;
-class DataTypeErrorHandler;
 class SyncClient;
 
 // A ref-counted wrapper around a GenericChangeProcessor for use with datatypes
 // that don't live on the UI thread.
 //
 // We need to make it refcounted as the ownership transfer from the
 // DataTypeController is dependent on threading, and hence racy. The
 // SharedChangeProcessor should be created on the UI thread, but should only be
 // connected and used on the same thread as the datatype it interacts with.
 //
@@ skipping 14 matching lines @@
 
   // Connect to the Syncer and prepare to handle changes for |type|. Will
   // create and store a new GenericChangeProcessor and return a weak pointer to
   // the syncer::SyncableService associated with |type|.
   // Note: If this SharedChangeProcessor has been disconnected, or the
   // syncer::SyncableService was not alive, will return a null weak pointer.
   virtual base::WeakPtr<syncer::SyncableService> Connect(
       SyncClient* sync_client,
       GenericChangeProcessorFactory* processor_factory,
       syncer::UserShare* user_share,
-      DataTypeErrorHandler* error_handler,
+      syncer::DataTypeErrorHandler* error_handler,
       syncer::ModelType type,
       const base::WeakPtr<syncer::SyncMergeResult>& merge_result);
 
   // Disconnects from the generic change processor. May be called from any
   // thread. After this, all attempts to interact with the change processor by
   // |local_service_| are dropped and return errors. The syncer will be safe to
   // shut down from the point of view of this datatype.
   // Note: Once disconnected, you cannot reconnect without creating a new
   // SharedChangeProcessor.
   // Returns: true if we were previously succesfully connected, false if we were
@@ skipping 48 matching lines @@
   // destructed and/or disconnected on this loop, see ~SharedChangeProcessor.
   const scoped_refptr<const base::SingleThreadTaskRunner> frontend_task_runner_;
 
   // The loop that all methods except the constructor, destructor, and
   // Disconnect() should be called on.  Set in Connect().
   scoped_refptr<base::SingleThreadTaskRunner> backend_task_runner_;
 
   // Used only on |backend_loop_|.
   GenericChangeProcessor* generic_change_processor_;
 
-  DataTypeErrorHandler* error_handler_;
+  syncer::DataTypeErrorHandler* error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(SharedChangeProcessor);
 };
 
 }  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_SHARED_CHANGE_PROCESSOR_H_