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

components/sync/engine/engine_components_factory.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.
 //
-// InternalComponentsFactory exists so that tests can override creation of
+// EngineComponentsFactory exists so that tests can override creation of
 // components used by the SyncManager that are not exposed across the sync
 // API boundary.
 
-#ifndef COMPONENTS_SYNC_CORE_INTERNAL_COMPONENTS_FACTORY_H_
-#define COMPONENTS_SYNC_CORE_INTERNAL_COMPONENTS_FACTORY_H_
+#ifndef COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_
+#define COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "components/sync/engine/model_safe_worker.h"
 
 namespace syncer {
 
 class CancelationSignal;
 class DebugInfoGetter;
 class ExtensionsActivity;
 class ModelTypeRegistry;
 class ServerConnectionManager;
 class SyncCycleContext;
 class SyncEngineEventListener;
 class SyncScheduler;
 
 namespace syncable {
 class Directory;
 class DirectoryBackingStore;
 }
 
-class InternalComponentsFactory {
+class EngineComponentsFactory {

[skym, 2016/10/14 18:42:13]

This class needs a comment. You're in the best position to write that than we'll
ever have.

[maxbogue, 2016/10/14 20:25:00]

Done.

  public:
   enum EncryptionMethod {
     ENCRYPTION_LEGACY,
     // Option to enable support for keystore key based encryption.
     ENCRYPTION_KEYSTORE
   };
 
   enum BackoffOverride {
     BACKOFF_NORMAL,
     // Use this value for integration testing to avoid long delays /
     // timing out tests. Uses kInitialBackoffShortRetrySeconds (see
     // polling_constants.h) for all initial retries.
     BACKOFF_SHORT_INITIAL_RETRY_OVERRIDE
   };
 
   enum PreCommitUpdatesPolicy {

[skym, 2016/10/14 18:42:14]

I wonder if we can remove this (admittedly out of scope).

[maxbogue, 2016/10/14 20:25:00]

Probably!

     // By default, the server will enable or disable this experiment through the
     // sync protocol's experiments data type.
     SERVER_CONTROLLED_PRE_COMMIT_UPDATE_AVOIANCE,
 
     // This flag overrides the server's decision and enables the pre-commit
     // update avoidance experiment.
     FORCE_ENABLE_PRE_COMMIT_UPDATE_AVOIDANCE,
   };
 
   // Configuration options for internal components. This struct is expected
   // to grow and shrink over time with transient features / experiments,
   // roughly following command line flags in chrome. Implementations of
-  // InternalComponentsFactory can use this information to build components
+  // EngineComponentsFactory can use this information to build components
   // with appropriate bells and whistles.
   struct Switches {
     EncryptionMethod encryption_method;
     BackoffOverride backoff_override;
     PreCommitUpdatesPolicy pre_commit_updates_policy;
   };
 
   // For selecting the types of storage to use to persist sync data when
   // BuildDirectoryBackingStore() is called.
   enum StorageOption {
     // BuildDirectoryBackingStore should not use persistent on-disk storage.
     STORAGE_IN_MEMORY,

[skym, 2016/10/14 18:42:14]

Do we need to plumb this through for USS? Do we need a new bug to track this?

[maxbogue, 2016/10/14 20:25:00]

No, in USS land if we want to test something regarding storage it must go
through the model type.

     // Use this if you want BuildDirectoryBackingStore to create/use a real
     // on disk store.
     STORAGE_ON_DISK,
     // Use this to test the case where a directory fails to load.
     STORAGE_INVALID
   };
 
-  virtual ~InternalComponentsFactory() {}
+  virtual ~EngineComponentsFactory() {}
 
   virtual std::unique_ptr<SyncScheduler> BuildScheduler(
       const std::string& name,
       SyncCycleContext* context,
       CancelationSignal* cancelation_signal) = 0;
 
   virtual std::unique_ptr<SyncCycleContext> BuildContext(
       ServerConnectionManager* connection_manager,
       syncable::Directory* directory,
       ExtensionsActivity* extensions_activity,
       const std::vector<SyncEngineEventListener*>& listeners,
       DebugInfoGetter* debug_info_getter,
       ModelTypeRegistry* model_type_registry,
       const std::string& invalidator_client_id) = 0;
 
   virtual std::unique_ptr<syncable::DirectoryBackingStore>
   BuildDirectoryBackingStore(StorageOption storage,
                              const std::string& dir_name,
                              const base::FilePath& backing_filepath) = 0;
 
   // Returns the Switches struct that this object is using as configuration, if
   // the implementation is making use of one.
   virtual Switches GetSwitches() const = 0;

[skym, 2016/10/14 18:42:14]

Seems unfortunate that this is part of the interface.

[maxbogue, 2016/10/14 20:25:00]

¯\_(ツ)_/¯

 };
 
 }  // namespace syncer
 
-#endif  // COMPONENTS_SYNC_CORE_INTERNAL_COMPONENTS_FACTORY_H_
+#endif  // COMPONENTS_SYNC_ENGINE_ENGINE_COMPONENTS_FACTORY_H_