diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 09:35:42 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 09:35:42 +0000 |
| commit | c1c32c85357f14756247b04b8b5ae41b05bf2e16 (patch) | |
| tree | 58f25f64e1fa592e8daf276ef69901cd2218f929 /chrome/browser/sync/abstract_profile_sync_service_test.cc | |
| parent | 63ee33bde2ec8471a70f0f0ec6a1962dd07fc8ab (diff) | |
| download | chromium_src-c1c32c85357f14756247b04b8b5ae41b05bf2e16.zip chromium_src-c1c32c85357f14756247b04b8b5ae41b05bf2e16.tar.gz chromium_src-c1c32c85357f14756247b04b8b5ae41b05bf2e16.tar.bz2 | |
[Sync] Move 'sync' target to sync/
Also move related test files.
Move WriteNode::UpdateEntryWithEncryption to nigori_util.h.
Clean up defines and dependencies. In particular, get rid of SYNC_ENGINE_VERSION_STRING and hard-code the string in the single place it's used.
Rename data_encryption.* to data_encryption_win.* and add a pragma for crypt32.lib.
Clean up exit-time constructor warnings in sync{able,er}_unittest.cc.
Remove some unused files.
BUG=117585
TEST=
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9699057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/abstract_profile_sync_service_test.cc')
| -rw-r--r-- | chrome/browser/sync/abstract_profile_sync_service_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 6797dbf..e7e3ddf 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -8,11 +8,11 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "chrome/browser/sync/internal_api/write_transaction.h" -#include "chrome/browser/sync/syncable/syncable.h" -#include "chrome/browser/sync/test/engine/test_id_factory.h" #include "chrome/browser/sync/test_profile_sync_service.h" -#include "chrome/browser/sync/util/cryptographer.h" #include "sync/protocol/sync.pb.h" +#include "sync/syncable/syncable.h" +#include "sync/test/engine/test_id_factory.h" +#include "sync/util/cryptographer.h" using browser_sync::TestIdFactory; using content::BrowserThread; |