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

Unified Diff: sync/api/sync_error_unittest.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 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
« no previous file with comments | « sync/api/sync_error.cc ('k') | sync/api/syncable_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/api/sync_error_unittest.cc
diff --git a/sync/api/sync_error_unittest.cc b/sync/api/sync_error_unittest.cc
index 593eb0f16b6102017fbb343194afb888568ecf18..d14409fa5bf00c85d60edf2fbf2fc5d3c29835af 100644
--- a/sync/api/sync_error_unittest.cc
+++ b/sync/api/sync_error_unittest.cc
@@ -12,7 +12,7 @@
namespace syncer {
using std::string;
-using syncable::ModelType;
+using syncer::ModelType;
namespace {
@@ -26,7 +26,7 @@ TEST_F(SyncErrorTest, Unset) {
TEST_F(SyncErrorTest, Default) {
tracked_objects::Location location = FROM_HERE;
std::string msg = "test";
- ModelType type = syncable::PREFERENCES;
+ ModelType type = syncer::PREFERENCES;
SyncError error(location, msg, type);
ASSERT_TRUE(error.IsSet());
EXPECT_EQ(location.line_number(), error.location().line_number());
@@ -37,7 +37,7 @@ TEST_F(SyncErrorTest, Default) {
TEST_F(SyncErrorTest, Reset) {
tracked_objects::Location location = FROM_HERE;
std::string msg = "test";
- ModelType type = syncable::PREFERENCES;
+ ModelType type = syncer::PREFERENCES;
SyncError error;
EXPECT_FALSE(error.IsSet());
@@ -50,7 +50,7 @@ TEST_F(SyncErrorTest, Reset) {
tracked_objects::Location location2 = FROM_HERE;
std::string msg2 = "test";
- ModelType type2 = syncable::PREFERENCES;
+ ModelType type2 = syncer::PREFERENCES;
error.Reset(location2, msg2, type2);
ASSERT_TRUE(error.IsSet());
EXPECT_EQ(location2.line_number(), error.location().line_number());
@@ -61,7 +61,7 @@ TEST_F(SyncErrorTest, Reset) {
TEST_F(SyncErrorTest, Copy) {
tracked_objects::Location location = FROM_HERE;
std::string msg = "test";
- ModelType type = syncable::PREFERENCES;
+ ModelType type = syncer::PREFERENCES;
SyncError error1;
EXPECT_FALSE(error1.IsSet());
@@ -89,7 +89,7 @@ TEST_F(SyncErrorTest, Copy) {
TEST_F(SyncErrorTest, Assign) {
tracked_objects::Location location = FROM_HERE;
std::string msg = "test";
- ModelType type = syncable::PREFERENCES;
+ ModelType type = syncer::PREFERENCES;
SyncError error1;
EXPECT_FALSE(error1.IsSet());
@@ -116,7 +116,7 @@ TEST_F(SyncErrorTest, Assign) {
TEST_F(SyncErrorTest, ToString) {
tracked_objects::Location location = FROM_HERE;
std::string msg = "test";
- ModelType type = syncable::PREFERENCES;
+ ModelType type = syncer::PREFERENCES;
std::string expected = "Preferences, Sync Error: test";
SyncError error(location, msg, type);
EXPECT_TRUE(error.IsSet());
« no previous file with comments | « sync/api/sync_error.cc ('k') | sync/api/syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698