summaryrefslogtreecommitdiffstats
path: root/sync/js
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/js
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/js')
-rw-r--r--sync/js/DEPS1
-rw-r--r--sync/js/js_arg_list.h2
-rw-r--r--sync/js/js_event_details.h2
-rw-r--r--sync/js/js_test_util.h2
-rw-r--r--sync/js/sync_js_controller.h2
5 files changed, 5 insertions, 4 deletions
diff --git a/sync/js/DEPS b/sync/js/DEPS
index 82d1d29..22a89b2 100644
--- a/sync/js/DEPS
+++ b/sync/js/DEPS
@@ -1,3 +1,4 @@
include_rules = [
+ "+sync/internal_api/public/util",
"+sync/util",
]
diff --git a/sync/js/js_arg_list.h b/sync/js/js_arg_list.h
index aab49d9..40cf712 100644
--- a/sync/js/js_arg_list.h
+++ b/sync/js/js_arg_list.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/values.h"
-#include "sync/util/immutable.h"
+#include "sync/internal_api/public/util/immutable.h"
namespace browser_sync {
diff --git a/sync/js/js_event_details.h b/sync/js/js_event_details.h
index df59851..fe05066 100644
--- a/sync/js/js_event_details.h
+++ b/sync/js/js_event_details.h
@@ -11,7 +11,7 @@
#include <string>
#include "base/values.h"
-#include "sync/util/immutable.h"
+#include "sync/internal_api/public/util/immutable.h"
namespace browser_sync {
diff --git a/sync/js/js_test_util.h b/sync/js/js_test_util.h
index ef6bec7..3e8b24a 100644
--- a/sync/js/js_test_util.h
+++ b/sync/js/js_test_util.h
@@ -10,11 +10,11 @@
#include <string>
#include "base/memory/weak_ptr.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/js/js_backend.h"
#include "sync/js/js_controller.h"
#include "sync/js/js_event_handler.h"
#include "sync/js/js_reply_handler.h"
-#include "sync/util/weak_handle.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace base {
diff --git a/sync/js/sync_js_controller.h b/sync/js/sync_js_controller.h
index 6e8f100..dcc792d2 100644
--- a/sync/js/sync_js_controller.h
+++ b/sync/js/sync_js_controller.h
@@ -13,10 +13,10 @@
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "sync/internal_api/public/util/weak_handle.h"
#include "sync/js/js_arg_list.h"
#include "sync/js/js_controller.h"
#include "sync/js/js_event_handler.h"
-#include "sync/util/weak_handle.h"
namespace browser_sync {