| Index: sync/api/sync_error_unittest.cc
|
| diff --git a/sync/api/sync_error_unittest.cc b/sync/api/sync_error_unittest.cc
|
| index 71a24f1396babfef77462c060251aa1d18a26dca..97783c3f319648f83399b47ea59396e7c478ac05 100644
|
| --- a/sync/api/sync_error_unittest.cc
|
| +++ b/sync/api/sync_error_unittest.cc
|
| @@ -30,7 +30,7 @@ TEST_F(SyncErrorTest, Default) {
|
| ASSERT_TRUE(error.IsSet());
|
| EXPECT_EQ(location.line_number(), error.location().line_number());
|
| EXPECT_EQ(msg, error.message());
|
| - EXPECT_EQ(type, error.type());
|
| + EXPECT_EQ(type, error.model_type());
|
| }
|
|
|
| TEST_F(SyncErrorTest, Reset) {
|
| @@ -45,7 +45,7 @@ TEST_F(SyncErrorTest, Reset) {
|
| ASSERT_TRUE(error.IsSet());
|
| EXPECT_EQ(location.line_number(), error.location().line_number());
|
| EXPECT_EQ(msg, error.message());
|
| - EXPECT_EQ(type, error.type());
|
| + EXPECT_EQ(type, error.model_type());
|
|
|
| tracked_objects::Location location2 = FROM_HERE;
|
| std::string msg2 = "test";
|
| @@ -54,7 +54,7 @@ TEST_F(SyncErrorTest, Reset) {
|
| ASSERT_TRUE(error.IsSet());
|
| EXPECT_EQ(location2.line_number(), error.location().line_number());
|
| EXPECT_EQ(msg2, error.message());
|
| - EXPECT_EQ(type2, error.type());
|
| + EXPECT_EQ(type2, error.model_type());
|
| }
|
|
|
| TEST_F(SyncErrorTest, Copy) {
|
| @@ -71,13 +71,13 @@ TEST_F(SyncErrorTest, Copy) {
|
| ASSERT_TRUE(error1.IsSet());
|
| EXPECT_EQ(location.line_number(), error1.location().line_number());
|
| EXPECT_EQ(msg, error1.message());
|
| - EXPECT_EQ(type, error1.type());
|
| + EXPECT_EQ(type, error1.model_type());
|
|
|
| SyncError error3(error1);
|
| ASSERT_TRUE(error3.IsSet());
|
| EXPECT_EQ(error1.location().line_number(), error3.location().line_number());
|
| EXPECT_EQ(error1.message(), error3.message());
|
| - EXPECT_EQ(error1.type(), error3.type());
|
| + EXPECT_EQ(error1.model_type(), error3.model_type());
|
|
|
| SyncError error4;
|
| EXPECT_FALSE(error4.IsSet());
|
| @@ -100,13 +100,13 @@ TEST_F(SyncErrorTest, Assign) {
|
| ASSERT_TRUE(error1.IsSet());
|
| EXPECT_EQ(location.line_number(), error1.location().line_number());
|
| EXPECT_EQ(msg, error1.message());
|
| - EXPECT_EQ(type, error1.type());
|
| + EXPECT_EQ(type, error1.model_type());
|
|
|
| error2 = error1;
|
| ASSERT_TRUE(error2.IsSet());
|
| EXPECT_EQ(error1.location().line_number(), error2.location().line_number());
|
| EXPECT_EQ(error1.message(), error2.message());
|
| - EXPECT_EQ(error1.type(), error2.type());
|
| + EXPECT_EQ(error1.model_type(), error2.model_type());
|
|
|
| error2 = SyncError();
|
| EXPECT_FALSE(error2.IsSet());
|
|
|