summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/internal_api/syncapi_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:06:41 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-10 01:06:41 +0000
commit1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a (patch)
treea1c5b036a8aad3554aaca8947c3a249a8d5945e3 /chrome/browser/sync/internal_api/syncapi_unittest.cc
parent70180a806fe954878cdca606620da7a153a9efe7 (diff)
downloadchromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.zip
chromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.tar.gz
chromium_src-1bcf30ec84f19d40cc5c3f6051d0bb5860bfc74a.tar.bz2
[Sync] Create new top-level sync/ directory
Move sync .proto files to sync/protocol. Update all references. This begins the Great Sync Migration. BUG=117585,43624 TEST= Review URL: https://chromiumcodereview.appspot.com/9668028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/internal_api/syncapi_unittest.cc')
-rw-r--r--chrome/browser/sync/internal_api/syncapi_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc
index 1d66b49..94214d2 100644
--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc
+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc
@@ -43,13 +43,7 @@
#include "chrome/browser/sync/js/js_test_util.h"
#include "chrome/browser/sync/notifier/sync_notifier.h"
#include "chrome/browser/sync/notifier/sync_notifier_observer.h"
-#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
-#include "chrome/browser/sync/protocol/encryption.pb.h"
-#include "chrome/browser/sync/protocol/extension_specifics.pb.h"
-#include "chrome/browser/sync/protocol/password_specifics.pb.h"
-#include "chrome/browser/sync/protocol/preference_specifics.pb.h"
#include "chrome/browser/sync/protocol/proto_value_conversions.h"
-#include "chrome/browser/sync/protocol/sync.pb.h"
#include "chrome/browser/sync/sessions/sync_session.h"
#include "chrome/browser/sync/syncable/model_type_test_util.h"
#include "chrome/browser/sync/syncable/syncable.h"
@@ -60,6 +54,12 @@
#include "chrome/browser/sync/util/cryptographer.h"
#include "chrome/browser/sync/util/extensions_activity_monitor.h"
#include "chrome/browser/sync/util/time.h"
+#include "sync/protocol/bookmark_specifics.pb.h"
+#include "sync/protocol/encryption.pb.h"
+#include "sync/protocol/extension_specifics.pb.h"
+#include "sync/protocol/password_specifics.pb.h"
+#include "sync/protocol/preference_specifics.pb.h"
+#include "sync/protocol/sync.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"