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/util | |
| 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/util')
| -rw-r--r-- | sync/util/DEPS | 2 | ||||
| -rw-r--r-- | sync/util/cryptographer.h | 2 | ||||
| -rw-r--r-- | sync/util/cryptographer_unittest.cc | 2 | ||||
| -rw-r--r-- | sync/util/data_type_histogram.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sync/util/DEPS b/sync/util/DEPS index 69e34a9..0662b96 100644 --- a/sync/util/DEPS +++ b/sync/util/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+crypto", - "+sync/internal_api/public/syncable", + "+sync/internal_api/public/base", "+sync/internal_api/public/util", "+sync/protocol", "+sync/test/fake_encryptor.h", diff --git a/sync/util/cryptographer.h b/sync/util/cryptographer.h index a27fc1d..f68655d 100644 --- a/sync/util/cryptographer.h +++ b/sync/util/cryptographer.h @@ -13,7 +13,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/base/model_type.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/util/nigori.h" diff --git a/sync/util/cryptographer_unittest.cc b/sync/util/cryptographer_unittest.cc index ca9c48d..d493b20 100644 --- a/sync/util/cryptographer_unittest.cc +++ b/sync/util/cryptographer_unittest.cc @@ -8,7 +8,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" -#include "sync/internal_api/public/syncable/model_type_test_util.h" +#include "sync/internal_api/public/base/model_type_test_util.h" #include "sync/protocol/nigori_specifics.pb.h" #include "sync/protocol/password_specifics.pb.h" #include "sync/test/fake_encryptor.h" diff --git a/sync/util/data_type_histogram.h b/sync/util/data_type_histogram.h index 869f162..ed66bb7 100644 --- a/sync/util/data_type_histogram.h +++ b/sync/util/data_type_histogram.h @@ -8,7 +8,7 @@ #include "base/metrics/histogram.h" #include "base/time.h" -#include "sync/internal_api/public/syncable/model_type.h" +#include "sync/internal_api/public/base/model_type.h" // For now, this just implements UMA_HISTOGRAM_LONG_TIMES. This can be adjusted // if we feel the min, max, or bucket count amount are not appropriate. |