summaryrefslogtreecommitdiffstats
path: root/sync/test
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 21:59:54 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 21:59:54 +0000
commit3e65977489925662657d91d334d6e9d1b520c60a (patch)
tree54d3a26a673c2cef9192db20693bf3ce71c8498a /sync/test
parentffc644556542375a622141a4645eabad385cc737 (diff)
downloadchromium_src-3e65977489925662657d91d334d6e9d1b520c60a.zip
chromium_src-3e65977489925662657d91d334d6e9d1b520c60a.tar.gz
chromium_src-3e65977489925662657d91d334d6e9d1b520c60a.tar.bz2
Move non_blocking_sync_common.h to internal_api
This CL belongs to a series that implements encryption for non-blocking types. It's been split off because it contains a lot of trivial changes that would make reviewing the meaningful changes more difficult. The move is required because the next CL will add an 'UpdateResponseList' parameter to SyncContextProxy::ConnectTypeToSync(). The UpdateResponseList is a typedef, and therefore difficult to forward-declare in the same way as the InitialDataTypeContext. R=zea BUG=351005 Review URL: https://codereview.chromium.org/428643003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
-rw-r--r--sync/test/engine/mock_model_type_sync_proxy.h2
-rw-r--r--sync/test/engine/mock_model_type_sync_worker.h2
-rw-r--r--sync/test/engine/single_type_mock_server.h3
3 files changed, 3 insertions, 4 deletions
diff --git a/sync/test/engine/mock_model_type_sync_proxy.h b/sync/test/engine/mock_model_type_sync_proxy.h
index e6f16a9..271b59f 100644
--- a/sync/test/engine/mock_model_type_sync_proxy.h
+++ b/sync/test/engine/mock_model_type_sync_proxy.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "sync/engine/model_type_sync_proxy.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
namespace syncer {
diff --git a/sync/test/engine/mock_model_type_sync_worker.h b/sync/test/engine/mock_model_type_sync_worker.h
index 5fb96f3..498e9ee 100644
--- a/sync/test/engine/mock_model_type_sync_worker.h
+++ b/sync/test/engine/mock_model_type_sync_worker.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
#include "sync/engine/model_type_sync_worker.h"
-#include "sync/engine/non_blocking_sync_common.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
namespace syncer {
diff --git a/sync/test/engine/single_type_mock_server.h b/sync/test/engine/single_type_mock_server.h
index 39ad35c..2e3684c 100644
--- a/sync/test/engine/single_type_mock_server.h
+++ b/sync/test/engine/single_type_mock_server.h
@@ -5,9 +5,8 @@
#ifndef SYNC_TEST_ENGINE_SINGLE_TYPE_MOCK_SERVER_H_
#define SYNC_TEST_ENGINE_SINGLE_TYPE_MOCK_SERVER_H_
-#include "sync/engine/non_blocking_sync_common.h"
-
#include "sync/internal_api/public/base/model_type.h"
+#include "sync/internal_api/public/non_blocking_sync_common.h"
namespace syncer {