diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 01:30:56 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-03 01:30:56 +0000 |
| commit | 002d391999fbbd290c9189056cd6262f827b825a (patch) | |
| tree | bc400541b7c8e1b5833748f454b35f78e0f7ce9d /sync/protocol | |
| parent | 2f30fff337549f07694b3ed02267f5f747a587aa (diff) | |
| download | chromium_src-002d391999fbbd290c9189056cd6262f827b825a.zip chromium_src-002d391999fbbd290c9189056cd6262f827b825a.tar.gz chromium_src-002d391999fbbd290c9189056cd6262f827b825a.tar.bz2 | |
[Sync] Move model_type* from syncable/ to base/
Also move enum_set* to base/.
This is the first step in moving ModelType et al. to the syncer
namespace (from syncer::syncable).
Move PurgeStalePayload() back to sync_session.cc.
Move ModelTypePayloadMapFromRoutingInfo() to model_safe_worker.* and rename it to ModelSafeRoutingInfoToPayloadMap().
BUG=128060
TEST=
Review URL: https://chromiumcodereview.appspot.com/10690071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/protocol')
| -rw-r--r-- | sync/protocol/DEPS | 2 | ||||
| -rw-r--r-- | sync/protocol/proto_value_conversions_unittest.cc | 2 | ||||
| -rw-r--r-- | sync/protocol/sync_protocol_error.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sync/protocol/DEPS b/sync/protocol/DEPS index d60f62f..00a61b9 100644 --- a/sync/protocol/DEPS +++ b/sync/protocol/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+sync/internal_api/public/syncable", + "+sync/internal_api/public/base", ] diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc index 304a33f..173a1c0 100644 --- a/sync/protocol/proto_value_conversions_unittest.cc +++ b/sync/protocol/proto_value_conversions_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/app_notification_specifics.pb.h" #include "sync/protocol/app_setting_specifics.pb.h" #include "sync/protocol/app_specifics.pb.h" diff --git a/sync/protocol/sync_protocol_error.h b/sync/protocol/sync_protocol_error.h index 718cc2d..29b7f19 100644 --- a/sync/protocol/sync_protocol_error.h +++ b/sync/protocol/sync_protocol_error.h @@ -8,7 +8,7 @@ #include <string> #include "base/values.h" -#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/base/model_type.h" namespace syncer{ |