Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync / glue / sync_backend_host_core.h

diff --git a/src/chrome/browser/sync/glue/sync_backend_host_core.h b/src/chrome/browser/sync/glue/sync_backend_host_core.h
index 4e1b921..d0b9793 100644 (file)
--- a/src/chrome/browser/sync/glue/sync_backend_host_core.h
+++ b/src/chrome/browser/sync/glue/sync_backend_host_core.h
@@ -8,8 +8,8 @@
 #include "base/memory/ref_counted.h"
 
 #include "base/timer/timer.h"
-#include "chrome/browser/sync/glue/chrome_encryptor.h"
 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
+#include "components/sync_driver/system_encryptor.h"
 #include "sync/internal_api/public/base/cancelation_signal.h"
 #include "sync/internal_api/public/sync_encryption_handler.h"
 #include "url/gurl.h"
@@ -99,9 +99,9 @@ class SyncBackendHostCore
       syncer::ModelTypeSet restored_types) OVERRIDE;
   virtual void OnConnectionStatusChange(
       syncer::ConnectionStatus status) OVERRIDE;
-  virtual void OnStopSyncingPermanently() OVERRIDE;
   virtual void OnActionableError(
       const syncer::SyncProtocolError& sync_error) OVERRIDE;
+  virtual void OnMigrationRequested(syncer::ModelTypeSet types) OVERRIDE;
 
   // SyncEncryptionHandler::Observer implementation.
   virtual void OnPassphraseRequired(
@@ -259,7 +259,7 @@ class SyncBackendHostCore
   scoped_ptr<base::RepeatingTimer<SyncBackendHostCore> > save_changes_timer_;
 
   // Our encryptor, which uses Chrome's encryption functions.
-  ChromeEncryptor encryptor_;
+  SystemEncryptor encryptor_;
 
   // A special ChangeProcessor that tracks the DEVICE_INFO type for us.
   scoped_ptr<SyncedDeviceTracker> synced_device_tracker_;