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

Unified Diff: sync/internal_api/public/base/model_type_payload_map_unittest.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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
« no previous file with comments | « sync/internal_api/public/base/model_type_payload_map.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/internal_api/public/base/model_type_payload_map_unittest.cc
diff --git a/sync/internal_api/public/base/model_type_payload_map_unittest.cc b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
index 1a20867d3577190b42a857576d00ddaa4739c8a6..19762eeb1390725034670ea48545eb4ea83a92d1 100644
--- a/sync/internal_api/public/base/model_type_payload_map_unittest.cc
+++ b/sync/internal_api/public/base/model_type_payload_map_unittest.cc
@@ -43,30 +43,30 @@ TEST_F(ModelTypePayloadMapTest, TypePayloadMapToValue) {
}
TEST_F(ModelTypePayloadMapTest, CoalescePayloads) {
- syncer::ModelTypePayloadMap original;
+ ModelTypePayloadMap original;
std::string empty_payload;
std::string payload1 = "payload1";
std::string payload2 = "payload2";
std::string payload3 = "payload3";
- original[syncer::BOOKMARKS] = empty_payload;
- original[syncer::PASSWORDS] = payload1;
- original[syncer::AUTOFILL] = payload2;
- original[syncer::THEMES] = payload3;
+ original[BOOKMARKS] = empty_payload;
+ original[PASSWORDS] = payload1;
+ original[AUTOFILL] = payload2;
+ original[THEMES] = payload3;
- syncer::ModelTypePayloadMap update;
- update[syncer::BOOKMARKS] = empty_payload; // Same.
- update[syncer::PASSWORDS] = empty_payload; // Overwrite with empty.
- update[syncer::AUTOFILL] = payload1; // Overwrite with non-empty.
- update[syncer::SESSIONS] = payload2; // New.
+ ModelTypePayloadMap update;
+ update[BOOKMARKS] = empty_payload; // Same.
+ update[PASSWORDS] = empty_payload; // Overwrite with empty.
+ update[AUTOFILL] = payload1; // Overwrite with non-empty.
+ update[SESSIONS] = payload2; // New.
// Themes untouched.
CoalescePayloads(&original, update);
ASSERT_EQ(5U, original.size());
- EXPECT_EQ(empty_payload, original[syncer::BOOKMARKS]);
- EXPECT_EQ(payload1, original[syncer::PASSWORDS]);
- EXPECT_EQ(payload1, original[syncer::AUTOFILL]);
- EXPECT_EQ(payload2, original[syncer::SESSIONS]);
- EXPECT_EQ(payload3, original[syncer::THEMES]);
+ EXPECT_EQ(empty_payload, original[BOOKMARKS]);
+ EXPECT_EQ(payload1, original[PASSWORDS]);
+ EXPECT_EQ(payload1, original[AUTOFILL]);
+ EXPECT_EQ(payload2, original[SESSIONS]);
+ EXPECT_EQ(payload3, original[THEMES]);
}
} // namespace
« no previous file with comments | « sync/internal_api/public/base/model_type_payload_map.cc ('k') | sync/internal_api/public/base_node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698