Index: chrome/browser/sync/engine/get_commit_ids_command.cc |
diff --git a/chrome/browser/sync/engine/get_commit_ids_command.cc b/chrome/browser/sync/engine/get_commit_ids_command.cc |
index 4bfc5e00d3d43bd6626b9becc29c42478a4930d6..c41c90d206a97a567a6b8657dc9fab545750f2a4 100644 |
--- a/chrome/browser/sync/engine/get_commit_ids_command.cc |
+++ b/chrome/browser/sync/engine/get_commit_ids_command.cc |
@@ -8,11 +8,11 @@ |
#include <utility> |
#include <vector> |
-#include "chrome/browser/sync/engine/nigori_util.h" |
+#include "chrome/browser/sync/encryption/nigori_util.h" |
#include "chrome/browser/sync/engine/syncer_util.h" |
#include "chrome/browser/sync/syncable/directory_manager.h" |
#include "chrome/browser/sync/syncable/syncable.h" |
-#include "chrome/browser/sync/util/cryptographer.h" |
+#include "chrome/browser/sync/encryption/cryptographer.h" |
using std::set; |
using std::vector; |
@@ -89,7 +89,7 @@ bool IsEntryReadyForCommit(const syncable::ModelTypeSet& encrypted_types, |
if (encrypted_types.count(entry.GetModelType()) > 0 && |
(passphrase_missing || |
- syncable::EntryNeedsEncryption(encrypted_types, entry))) { |
+ browser_sync::encryption::EntryNeedsEncryption(encrypted_types, entry))) { |
// This entry requires encryption but is not properly encrypted (possibly |
// due to the cryptographer not being initialized or the user hasn't |
// provided the most recent passphrase). |