summaryrefslogtreecommitdiffstats
path: root/sync/syncable
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 01:07:19 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 01:07:19 +0000
commit406203d804cfd1c0ff1b74bced465700df5a531b (patch)
treedbb0c78215287dd9215eb69411493bff8ae4d3f4 /sync/syncable
parenta263538270e30269c67e914fa67542e5d6da2be2 (diff)
downloadchromium_src-406203d804cfd1c0ff1b74bced465700df5a531b.zip
chromium_src-406203d804cfd1c0ff1b74bced465700df5a531b.tar.gz
chromium_src-406203d804cfd1c0ff1b74bced465700df5a531b.tar.bz2
sync: move internal_api components used by chrome/browser into internal_api/public
TBR=jhawkins@chromium.org BUG=131130 TEST= Review URL: https://chromiumcodereview.appspot.com/10534080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/syncable')
-rw-r--r--sync/syncable/DEPS1
-rw-r--r--sync/syncable/syncable.h8
2 files changed, 5 insertions, 4 deletions
diff --git a/sync/syncable/DEPS b/sync/syncable/DEPS
index 7b13d73..a92e267 100644
--- a/sync/syncable/DEPS
+++ b/sync/syncable/DEPS
@@ -3,6 +3,7 @@ include_rules = [
"+sql",
"+sync/internal_api/public/engine",
"+sync/internal_api/public/syncable",
+ "+sync/internal_api/public/util",
"+sync/protocol",
"+sync/test",
"+sync/util",
diff --git a/sync/syncable/syncable.h b/sync/syncable/syncable.h
index 16aa0a2..0cab389 100644
--- a/sync/syncable/syncable.h
+++ b/sync/syncable/syncable.h
@@ -27,16 +27,16 @@
#include "base/synchronization/lock.h"
#include "base/time.h"
#include "sync/internal_api/public/syncable/model_type.h"
+#include "sync/internal_api/public/util/immutable.h"
+#include "sync/internal_api/public/util/report_unrecoverable_error_function.h"
+#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/protocol/sync.pb.h"
#include "sync/syncable/blob.h"
#include "sync/syncable/dir_open_result.h"
#include "sync/syncable/syncable_id.h"
#include "sync/util/cryptographer.h"
-#include "sync/util/immutable.h"
-#include "sync/util/report_unrecoverable_error_function.h"
#include "sync/util/time.h"
-#include "sync/util/unrecoverable_error_handler.h"
-#include "sync/util/weak_handle.h"
namespace base {
class DictionaryValue;