summaryrefslogtreecommitdiffstats
path: root/sync/js
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 19:42:19 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-21 19:42:19 +0000
commit0c6c1e43289fc2e225a6c824aff40c9b63b5df78 (patch)
tree9ab1034e260c5887ecc7a70cd112cef97458582a /sync/js
parentae0c0f6af00c25b6c41c9e37e8cb849de9a9a680 (diff)
downloadchromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.zip
chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.gz
chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.bz2
Add base namespace to more values in sync and elsewhere.
This makes sync and net compile with no "using *Value". BUG= Review URL: https://codereview.chromium.org/17034006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/js')
-rw-r--r--sync/js/js_arg_list.cc4
-rw-r--r--sync/js/js_arg_list.h6
-rw-r--r--sync/js/js_event_details.cc5
-rw-r--r--sync/js/js_event_details.h7
-rw-r--r--sync/js/js_event_details_unittest.cc6
-rw-r--r--sync/js/js_test_util.cc8
6 files changed, 19 insertions, 17 deletions
diff --git a/sync/js/js_arg_list.cc b/sync/js/js_arg_list.cc
index 8eec0aa..e3317e5 100644
--- a/sync/js/js_arg_list.cc
+++ b/sync/js/js_arg_list.cc
@@ -10,11 +10,11 @@ namespace syncer {
JsArgList::JsArgList() {}
-JsArgList::JsArgList(ListValue* args) : args_(args) {}
+JsArgList::JsArgList(base::ListValue* args) : args_(args) {}
JsArgList::~JsArgList() {}
-const ListValue& JsArgList::Get() const {
+const base::ListValue& JsArgList::Get() const {
return args_.Get();
}
diff --git a/sync/js/js_arg_list.h b/sync/js/js_arg_list.h
index 72793e9..34a0cf6 100644
--- a/sync/js/js_arg_list.h
+++ b/sync/js/js_arg_list.h
@@ -23,18 +23,18 @@ class SYNC_EXPORT JsArgList {
JsArgList();
// Takes over the data in |args|, leaving |args| empty.
- explicit JsArgList(ListValue* args);
+ explicit JsArgList(base::ListValue* args);
~JsArgList();
- const ListValue& Get() const;
+ const base::ListValue& Get() const;
std::string ToString() const;
// Copy constructor and assignment operator welcome.
private:
- typedef Immutable<ListValue, HasSwapMemFnByPtr<ListValue> >
+ typedef Immutable<base::ListValue, HasSwapMemFnByPtr<base::ListValue> >
ImmutableListValue;
ImmutableListValue args_;
};
diff --git a/sync/js/js_event_details.cc b/sync/js/js_event_details.cc
index 16e4df7..0517b39 100644
--- a/sync/js/js_event_details.cc
+++ b/sync/js/js_event_details.cc
@@ -10,11 +10,12 @@ namespace syncer {
JsEventDetails::JsEventDetails() {}
-JsEventDetails::JsEventDetails(DictionaryValue* details) : details_(details) {}
+JsEventDetails::JsEventDetails(base::DictionaryValue* details)
+ : details_(details) {}
JsEventDetails::~JsEventDetails() {}
-const DictionaryValue& JsEventDetails::Get() const {
+const base::DictionaryValue& JsEventDetails::Get() const {
return details_.Get();
}
diff --git a/sync/js/js_event_details.h b/sync/js/js_event_details.h
index 9ca36db..ae970cc 100644
--- a/sync/js/js_event_details.h
+++ b/sync/js/js_event_details.h
@@ -23,18 +23,19 @@ class SYNC_EXPORT JsEventDetails {
JsEventDetails();
// Takes over the data in |details|, leaving |details| empty.
- explicit JsEventDetails(DictionaryValue* details);
+ explicit JsEventDetails(base::DictionaryValue* details);
~JsEventDetails();
- const DictionaryValue& Get() const;
+ const base::DictionaryValue& Get() const;
std::string ToString() const;
// Copy constructor and assignment operator welcome.
private:
- typedef Immutable<DictionaryValue, HasSwapMemFnByPtr<DictionaryValue> >
+ typedef Immutable<base::DictionaryValue,
+ HasSwapMemFnByPtr<base::DictionaryValue> >
ImmutableDictionaryValue;
ImmutableDictionaryValue details_;
diff --git a/sync/js/js_event_details_unittest.cc b/sync/js/js_event_details_unittest.cc
index 563def7..d93d521 100644
--- a/sync/js/js_event_details_unittest.cc
+++ b/sync/js/js_event_details_unittest.cc
@@ -19,11 +19,11 @@ TEST_F(JsEventDetailsTest, EmptyList) {
}
TEST_F(JsEventDetailsTest, FromDictionary) {
- DictionaryValue dict;
+ base::DictionaryValue dict;
dict.SetString("foo", "bar");
- dict.Set("baz", new ListValue());
+ dict.Set("baz", new base::ListValue());
- scoped_ptr<DictionaryValue> dict_copy(dict.DeepCopy());
+ scoped_ptr<base::DictionaryValue> dict_copy(dict.DeepCopy());
JsEventDetails details(&dict);
diff --git a/sync/js/js_test_util.cc b/sync/js/js_test_util.cc
index 6d9679f..331efcc 100644
--- a/sync/js/js_test_util.cc
+++ b/sync/js/js_test_util.cc
@@ -88,8 +88,8 @@ class HasDetailsMatcher
}
::testing::Matcher<const JsArgList&> HasArgsAsList(
- const ListValue& expected_args) {
- scoped_ptr<ListValue> expected_args_copy(expected_args.DeepCopy());
+ const base::ListValue& expected_args) {
+ scoped_ptr<base::ListValue> expected_args_copy(expected_args.DeepCopy());
return HasArgs(JsArgList(expected_args_copy.get()));
}
@@ -99,8 +99,8 @@ class HasDetailsMatcher
}
::testing::Matcher<const JsEventDetails&> HasDetailsAsDictionary(
- const DictionaryValue& expected_details) {
- scoped_ptr<DictionaryValue> expected_details_copy(
+ const base::DictionaryValue& expected_details) {
+ scoped_ptr<base::DictionaryValue> expected_details_copy(
expected_details.DeepCopy());
return HasDetails(JsEventDetails(expected_details_copy.get()));
}