19 files changed, 24 insertions, 25 deletions
diff --git a/sync/notifier/DEPS b/sync/notifier/DEPS
index fe689b9..4c55aa9 100644
--- a/sync/notifier/DEPS
+++ b/sync/notifier/DEPS
@@ -5,8 +5,7 @@ include_rules = [
   "+net/url_request/url_request_context.h",
   "+net/url_request/url_request_test_util.h",
 
-  "+sync/syncable/model_type.h",
-  "+sync/syncable/model_type_payload_map.h",
+  "+sync/internal_api/public/syncable",
   "+sync/protocol/service_constants.h",
   "+sync/util",
 
diff --git a/sync/notifier/chrome_invalidation_client.cc b/sync/notifier/chrome_invalidation_client.cc
index 401335c..5ddb56b 100644
--- a/sync/notifier/chrome_invalidation_client.cc
+++ b/sync/notifier/chrome_invalidation_client.cc
@@ -15,9 +15,9 @@
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/v2/types.pb.h"
 #include "jingle/notifier/listener/push_client.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/registration_manager.h"
-#include "sync/syncable/model_type.h"
 
 namespace {
 
diff --git a/sync/notifier/chrome_invalidation_client.h b/sync/notifier/chrome_invalidation_client.h
index 4e6cdaa..acfc001 100644
--- a/sync/notifier/chrome_invalidation_client.h
+++ b/sync/notifier/chrome_invalidation_client.h
@@ -17,11 +17,11 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
+#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/chrome_system_resources.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/state_writer.h"
-#include "sync/syncable/model_type.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 
 namespace buzz {
diff --git a/sync/notifier/chrome_invalidation_client_unittest.cc b/sync/notifier/chrome_invalidation_client_unittest.cc
index 4de8ce0..92f697f12 100644
--- a/sync/notifier/chrome_invalidation_client_unittest.cc
+++ b/sync/notifier/chrome_invalidation_client_unittest.cc
@@ -9,10 +9,10 @@
 #include "google/cacheinvalidation/include/types.h"
 #include "google/cacheinvalidation/v2/types.pb.h"
 #include "jingle/notifier/listener/fake_push_client.h"
+#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/mock_invalidation_state_tracker.h"
-#include "sync/syncable/model_type.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index e188adb..6f5c382 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -9,8 +9,8 @@
 #include "base/metrics/histogram.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "net/url_request/url_request_context.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/sync_notifier_observer.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
diff --git a/sync/notifier/invalidation_notifier.h b/sync/notifier/invalidation_notifier.h
index aebf833..01108f5 100644
--- a/sync/notifier/invalidation_notifier.h
+++ b/sync/notifier/invalidation_notifier.h
@@ -20,10 +20,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/chrome_invalidation_client.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/sync_notifier.h"
-#include "sync/syncable/model_type.h"
 #include "sync/util/weak_handle.h"
 
 namespace notifier {
diff --git a/sync/notifier/invalidation_notifier_unittest.cc b/sync/notifier/invalidation_notifier_unittest.cc
index c5f7132..8219ad8 100644
--- a/sync/notifier/invalidation_notifier_unittest.cc
+++ b/sync/notifier/invalidation_notifier_unittest.cc
@@ -10,11 +10,11 @@
 #include "jingle/notifier/base/notifier_options.h"
 #include "jingle/notifier/listener/fake_push_client.h"
 #include "net/url_request/url_request_test_util.h"
+#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/mock_invalidation_state_tracker.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
-#include "sync/syncable/model_type.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/invalidation_state_tracker.h b/sync/notifier/invalidation_state_tracker.h
index bfa27c9..5e46b06 100644
--- a/sync/notifier/invalidation_state_tracker.h
+++ b/sync/notifier/invalidation_state_tracker.h
@@ -11,7 +11,7 @@
 #include <map>
 
 #include "base/basictypes.h"
-#include "sync/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 
 namespace sync_notifier {
 
diff --git a/sync/notifier/invalidation_util.h b/sync/notifier/invalidation_util.h
index 80c032d..220fa44 100644
--- a/sync/notifier/invalidation_util.h
+++ b/sync/notifier/invalidation_util.h
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "google/cacheinvalidation/deps/callback.h"
-#include "sync/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 
 namespace invalidation {
 
diff --git a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
index af93d17..4ac2504 100644
--- a/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
+++ b/sync/notifier/non_blocking_invalidation_notifier_unittest.cc
@@ -10,10 +10,10 @@
 #include "base/threading/thread.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "net/url_request/url_request_test_util.h"
+#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
-#include "sync/syncable/model_type.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "sync/util/weak_handle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/sync/notifier/p2p_notifier.cc b/sync/notifier/p2p_notifier.cc
index 70b35fe..2eae246 100644
--- a/sync/notifier/p2p_notifier.cc
+++ b/sync/notifier/p2p_notifier.cc
@@ -11,8 +11,8 @@
 #include "base/logging.h"
 #include "base/values.h"
 #include "jingle/notifier/listener/push_client.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/sync_notifier_observer.h"
-#include "sync/syncable/model_type_payload_map.h"
 
 namespace sync_notifier {
 
diff --git a/sync/notifier/p2p_notifier.h b/sync/notifier/p2p_notifier.h
index f7b882e..341bc8b 100644
--- a/sync/notifier/p2p_notifier.h
+++ b/sync/notifier/p2p_notifier.h
@@ -17,8 +17,8 @@
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "jingle/notifier/listener/push_client_observer.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/sync_notifier.h"
-#include "sync/syncable/model_type.h"
 
 namespace notifier {
 class PushClient;
diff --git a/sync/notifier/p2p_notifier_unittest.cc b/sync/notifier/p2p_notifier_unittest.cc
index fe1a623..28ec600 100644
--- a/sync/notifier/p2p_notifier_unittest.cc
+++ b/sync/notifier/p2p_notifier_unittest.cc
@@ -7,8 +7,8 @@
 #include <cstddef>
 
 #include "jingle/notifier/listener/fake_push_client.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
-#include "sync/syncable/model_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_notifier {
diff --git a/sync/notifier/registration_manager.cc b/sync/notifier/registration_manager.cc
index de844c5..8e04916 100644
--- a/sync/notifier/registration_manager.cc
+++ b/sync/notifier/registration_manager.cc
@@ -11,8 +11,8 @@
 #include "base/rand_util.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
 #include "google/cacheinvalidation/include/types.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/syncable/model_type.h"
 
 namespace sync_notifier {
 
diff --git a/sync/notifier/registration_manager.h b/sync/notifier/registration_manager.h
index e8639d0..44e7cf3 100644
--- a/sync/notifier/registration_manager.h
+++ b/sync/notifier/registration_manager.h
@@ -16,7 +16,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "base/time.h"
 #include "base/timer.h"
-#include "sync/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 // For invalidation::InvalidationListener::RegistrationState.
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 
diff --git a/sync/notifier/registration_manager_unittest.cc b/sync/notifier/registration_manager_unittest.cc
index 21172f8..2c143ce 100644
--- a/sync/notifier/registration_manager_unittest.cc
+++ b/sync/notifier/registration_manager_unittest.cc
@@ -13,8 +13,8 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "google/cacheinvalidation/include/invalidation-client.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 #include "sync/notifier/invalidation_util.h"
-#include "sync/syncable/model_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sync_notifier {
diff --git a/sync/notifier/sync_notifier.h b/sync/notifier/sync_notifier.h
index a973538..94f5fc2 100644
--- a/sync/notifier/sync_notifier.h
+++ b/sync/notifier/sync_notifier.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "sync/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type.h"
 
 namespace sync_notifier {
 class SyncNotifierObserver;
diff --git a/sync/notifier/sync_notifier_factory_unittest.cc b/sync/notifier/sync_notifier_factory_unittest.cc
index f7e16f4..b0f31e9 100644
--- a/sync/notifier/sync_notifier_factory_unittest.cc
+++ b/sync/notifier/sync_notifier_factory_unittest.cc
@@ -14,11 +14,11 @@
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/url_request/url_request_test_util.h"
+#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 #include "sync/notifier/invalidation_state_tracker.h"
 #include "sync/notifier/mock_sync_notifier_observer.h"
 #include "sync/notifier/sync_notifier.h"
-#include "sync/syncable/model_type.h"
-#include "sync/syncable/model_type_payload_map.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/sync/notifier/sync_notifier_observer.h b/sync/notifier/sync_notifier_observer.h
index 1130c9e..a6a629f 100644
--- a/sync/notifier/sync_notifier_observer.h
+++ b/sync/notifier/sync_notifier_observer.h
@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "sync/syncable/model_type_payload_map.h"
+#include "sync/internal_api/public/syncable/model_type_payload_map.h"
 
 namespace sync_notifier {