[Sync] Move the last things out of core/.

components/sync/engine/sync_manager.h

 // 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.
 
-#ifndef COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
-#define COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
+#ifndef COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
+#define COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "components/sync/base/invalidation_interface.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/base/weak_handle.h"
-#include "components/sync/core/configure_reason.h"
-#include "components/sync/core/connection_status.h"
-#include "components/sync/core/internal_components_factory.h"
-#include "components/sync/core/model_type_connector.h"
-#include "components/sync/core/shutdown_reason.h"
-#include "components/sync/core/sync_encryption_handler.h"
+#include "components/sync/engine/configure_reason.h"
+#include "components/sync/engine/connection_status.h"
+#include "components/sync/engine/engine_components_factory.h"
 #include "components/sync/engine/events/protocol_event.h"
 #include "components/sync/engine/model_safe_worker.h"
+#include "components/sync/engine/model_type_connector.h"
 #include "components/sync/engine/net/http_post_provider_factory.h"
+#include "components/sync/engine/shutdown_reason.h"
+#include "components/sync/engine/sync_encryption_handler.h"
 #include "components/sync/engine/sync_status.h"
 #include "components/sync/protocol/sync_protocol_error.h"
 #include "components/sync/syncable/change_record.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 
 class GURL;
 
 namespace sync_pb {
 class EncryptedData;
 }  // namespace sync_pb
 
 namespace syncer {
 
 class BaseTransaction;
 class CancelationSignal;
 class DataTypeDebugInfoListener;
 class Encryptor;
+class EngineComponentsFactory;
 class ExtensionsActivity;
-class InternalComponentsFactory;
 class JsBackend;
 class JsEventHandler;
 class ProtocolEvent;
 class SyncCycleSnapshot;
 class SyncEncryptionHandler;
 class SyncScheduler;
 class TypeDebugInfoObserver;
 class UnrecoverableErrorHandler;
 struct Experiments;
 struct UserShare;
@@ skipping 178 matching lines @@
     // Credentials to be used when talking to the sync server.
     SyncCredentials credentials;
 
     // Unqiuely identifies this client to the invalidation notification server.
     std::string invalidator_client_id;
 
     // Used to boostrap the cryptographer.
     std::string restored_key_for_bootstrapping;
     std::string restored_keystore_key_for_bootstrapping;
 
-    std::unique_ptr<InternalComponentsFactory> internal_components_factory;
+    std::unique_ptr<EngineComponentsFactory> engine_components_factory;
 
     // Must outlive SyncManager.
     Encryptor* encryptor;
 
     WeakHandle<UnrecoverableErrorHandler> unrecoverable_error_handler;
     base::Closure report_unrecoverable_error_function;
 
     // Carries shutdown requests across threads and will be used to cut short
     // any network I/O and tell the syncer to exit early.
     //
@@ skipping 133 matching lines @@
   virtual void ClearServerData(const ClearServerDataCallback& callback) = 0;
 
   // Updates Sync's tracking of whether the cookie jar has a mismatch with the
   // chrome account. See ClientConfigParams proto message for more info.
   // Note: this does not trigger a sync cycle. It just updates the sync context.
   virtual void OnCookieJarChanged(bool account_mismatch, bool empty_jar) = 0;
 };
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
+#endif  // COMPONENTS_SYNC_ENGINE_SYNC_MANAGER_H_