summaryrefslogtreecommitdiffstats
path: root/sync/sessions
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 05:10:26 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-13 05:10:26 +0000
commit08230555e497c5d5f50c03c1703636943c143497 (patch)
tree7083abfb34fb309d35e85cd0291f640168e323e9 /sync/sessions
parentd0c44b74dc1c764c51ca4e9c0158265dca631120 (diff)
downloadchromium_src-08230555e497c5d5f50c03c1703636943c143497.zip
chromium_src-08230555e497c5d5f50c03c1703636943c143497.tar.gz
chromium_src-08230555e497c5d5f50c03c1703636943c143497.tar.bz2
sync: Move NonBlockingTypeProcessor to sync/engine
Moves NonBlockingTypeProcessor from sync/internal_api to sync/engine. It's become increasingly clear to me that the NonBlockingTypeProcessor will be too big to expose outside of sync. When it comes time to export its functionality, we'll need to define a wrapper class with a simpler interface. This means that there's no benefit to keeping it in internal_api. There is a benefit to moving this to sync/engine. In this location, it should be able to collaborate more closely with its sibling, the NonBlockingTypeProcessorCore. We intend to start adding lots of code to this class soon. It's a good idea to get this move out of the way first, so we can have a better git history in the end. BUG=351005 Review URL: https://codereview.chromium.org/280693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions')
-rw-r--r--sync/sessions/model_type_registry.cc2
-rw-r--r--sync/sessions/model_type_registry_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/sync/sessions/model_type_registry.cc b/sync/sessions/model_type_registry.cc
index 668f8da..9cc6869 100644
--- a/sync/sessions/model_type_registry.cc
+++ b/sync/sessions/model_type_registry.cc
@@ -9,8 +9,8 @@
#include "base/observer_list.h"
#include "sync/engine/directory_commit_contributor.h"
#include "sync/engine/directory_update_handler.h"
+#include "sync/engine/non_blocking_type_processor.h"
#include "sync/engine/non_blocking_type_processor_core.h"
-#include "sync/internal_api/public/non_blocking_type_processor.h"
#include "sync/sessions/directory_type_debug_info_emitter.h"
namespace syncer {
diff --git a/sync/sessions/model_type_registry_unittest.cc b/sync/sessions/model_type_registry_unittest.cc
index a5e3c91..6b344eb 100644
--- a/sync/sessions/model_type_registry_unittest.cc
+++ b/sync/sessions/model_type_registry_unittest.cc
@@ -6,8 +6,8 @@
#include "base/deferred_sequenced_task_runner.h"
#include "base/message_loop/message_loop.h"
+#include "sync/engine/non_blocking_type_processor.h"
#include "sync/internal_api/public/base/model_type.h"
-#include "sync/internal_api/public/non_blocking_type_processor.h"
#include "sync/sessions/model_type_registry.h"
#include "sync/test/engine/fake_model_worker.h"
#include "sync/test/engine/test_directory_setter_upper.h"