Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1338)

Unified Diff: sync/internal_api/public/change_record_unittest.cc

Issue 17034006: Add base namespace to more values in sync and elsewhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sync/internal_api/public/change_record_unittest.cc
diff --git a/sync/internal_api/public/change_record_unittest.cc b/sync/internal_api/public/change_record_unittest.cc
index cd54189b1d5899eff70ebfaa8d22b10e2120fcb8..201ed655da15aa4aa599e7cf31cc394e83e276aa 100644
--- a/sync/internal_api/public/change_record_unittest.cc
+++ b/sync/internal_api/public/change_record_unittest.cc
@@ -60,7 +60,7 @@ void CheckChangeRecordValue(
value.Get("extra", &extra_value));
EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get()));
- scoped_ptr<DictionaryValue> expected_specifics_value(
+ scoped_ptr<base::DictionaryValue> expected_specifics_value(
EntitySpecificsToValue(record.specifics));
ExpectDictDictionaryValue(*expected_specifics_value,
value, "specifics");
@@ -70,7 +70,7 @@ void CheckChangeRecordValue(
class MockExtraChangeRecordData
: public ExtraPasswordChangeRecordData {
public:
- MOCK_CONST_METHOD0(ToValue, DictionaryValue*());
+ MOCK_CONST_METHOD0(ToValue, base::DictionaryValue*());
};
TEST_F(ChangeRecordTest, ChangeRecordToValue) {
@@ -88,7 +88,7 @@ TEST_F(ChangeRecordTest, ChangeRecordToValue) {
record.id = kTestId;
record.specifics = old_specifics;
record.extra.reset(new StrictMock<MockExtraChangeRecordData>());
- scoped_ptr<DictionaryValue> value(record.ToValue());
+ scoped_ptr<base::DictionaryValue> value(record.ToValue());
CheckChangeRecordValue(record, *value);
}
@@ -99,7 +99,7 @@ TEST_F(ChangeRecordTest, ChangeRecordToValue) {
record.id = kTestId;
record.specifics = old_specifics;
record.extra.reset(new StrictMock<MockExtraChangeRecordData>());
- scoped_ptr<DictionaryValue> value(record.ToValue());
+ scoped_ptr<base::DictionaryValue> value(record.ToValue());
CheckChangeRecordValue(record, *value);
}
@@ -109,7 +109,7 @@ TEST_F(ChangeRecordTest, ChangeRecordToValue) {
record.action = ChangeRecord::ACTION_DELETE;
record.id = kTestId;
record.specifics = old_specifics;
- scoped_ptr<DictionaryValue> value(record.ToValue());
+ scoped_ptr<base::DictionaryValue> value(record.ToValue());
CheckChangeRecordValue(record, *value);
}
@@ -120,15 +120,15 @@ TEST_F(ChangeRecordTest, ChangeRecordToValue) {
record.id = kTestId;
record.specifics = old_specifics;
- DictionaryValue extra_value;
+ base::DictionaryValue extra_value;
extra_value.SetString("foo", "bar");
scoped_ptr<StrictMock<MockExtraChangeRecordData> > extra(
new StrictMock<MockExtraChangeRecordData>());
EXPECT_CALL(*extra, ToValue()).Times(2).WillRepeatedly(
- Invoke(&extra_value, &DictionaryValue::DeepCopy));
+ Invoke(&extra_value, &base::DictionaryValue::DeepCopy));
record.extra.reset(extra.release());
- scoped_ptr<DictionaryValue> value(record.ToValue());
+ scoped_ptr<base::DictionaryValue> value(record.ToValue());
CheckChangeRecordValue(record, *value);
}
}
« no previous file with comments | « sync/internal_api/public/base/progress_marker_map.cc ('k') | sync/internal_api/public/engine/model_safe_worker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698