| Index: sync/api/sync_error_unittest.cc
|
| diff --git a/sync/api/sync_error_unittest.cc b/sync/api/sync_error_unittest.cc
|
| index d14409fa5bf00c85d60edf2fbf2fc5d3c29835af..71a24f1396babfef77462c060251aa1d18a26dca 100644
|
| --- a/sync/api/sync_error_unittest.cc
|
| +++ b/sync/api/sync_error_unittest.cc
|
| @@ -11,11 +11,10 @@
|
|
|
| namespace syncer {
|
|
|
| -using std::string;
|
| -using syncer::ModelType;
|
| -
|
| namespace {
|
|
|
| +using std::string;
|
| +
|
| typedef testing::Test SyncErrorTest;
|
|
|
| TEST_F(SyncErrorTest, Unset) {
|
| @@ -26,7 +25,7 @@ TEST_F(SyncErrorTest, Unset) {
|
| TEST_F(SyncErrorTest, Default) {
|
| tracked_objects::Location location = FROM_HERE;
|
| std::string msg = "test";
|
| - ModelType type = syncer::PREFERENCES;
|
| + ModelType type = PREFERENCES;
|
| SyncError error(location, msg, type);
|
| ASSERT_TRUE(error.IsSet());
|
| EXPECT_EQ(location.line_number(), error.location().line_number());
|
| @@ -37,7 +36,7 @@ TEST_F(SyncErrorTest, Default) {
|
| TEST_F(SyncErrorTest, Reset) {
|
| tracked_objects::Location location = FROM_HERE;
|
| std::string msg = "test";
|
| - ModelType type = syncer::PREFERENCES;
|
| + ModelType type = PREFERENCES;
|
|
|
| SyncError error;
|
| EXPECT_FALSE(error.IsSet());
|
| @@ -50,7 +49,7 @@ TEST_F(SyncErrorTest, Reset) {
|
|
|
| tracked_objects::Location location2 = FROM_HERE;
|
| std::string msg2 = "test";
|
| - ModelType type2 = syncer::PREFERENCES;
|
| + ModelType type2 = PREFERENCES;
|
| error.Reset(location2, msg2, type2);
|
| ASSERT_TRUE(error.IsSet());
|
| EXPECT_EQ(location2.line_number(), error.location().line_number());
|
| @@ -61,7 +60,7 @@ TEST_F(SyncErrorTest, Reset) {
|
| TEST_F(SyncErrorTest, Copy) {
|
| tracked_objects::Location location = FROM_HERE;
|
| std::string msg = "test";
|
| - ModelType type = syncer::PREFERENCES;
|
| + ModelType type = PREFERENCES;
|
|
|
| SyncError error1;
|
| EXPECT_FALSE(error1.IsSet());
|
| @@ -89,7 +88,7 @@ TEST_F(SyncErrorTest, Copy) {
|
| TEST_F(SyncErrorTest, Assign) {
|
| tracked_objects::Location location = FROM_HERE;
|
| std::string msg = "test";
|
| - ModelType type = syncer::PREFERENCES;
|
| + ModelType type = PREFERENCES;
|
|
|
| SyncError error1;
|
| EXPECT_FALSE(error1.IsSet());
|
| @@ -116,7 +115,7 @@ TEST_F(SyncErrorTest, Assign) {
|
| TEST_F(SyncErrorTest, ToString) {
|
| tracked_objects::Location location = FROM_HERE;
|
| std::string msg = "test";
|
| - ModelType type = syncer::PREFERENCES;
|
| + ModelType type = PREFERENCES;
|
| std::string expected = "Preferences, Sync Error: test";
|
| SyncError error(location, msg, type);
|
| EXPECT_TRUE(error.IsSet());
|
|
|