| Index: chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
|
| index 73496b3b61e6885b6f1161f36c9a8190e2a781df..80f31c55cf3ea50243e11c2c738cd24cc075833f 100644
|
| --- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
|
| @@ -53,8 +53,6 @@ class ThemeDataTypeControllerTest : public testing::Test {
|
| }
|
|
|
| void SetAssociateExpectations() {
|
| - EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).
|
| - WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(true)));
|
| EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| EXPECT_CALL(*model_associator_, AssociateModels()).
|
| @@ -105,8 +103,6 @@ TEST_F(ThemeDataTypeControllerTest, StartOk) {
|
| SetStartExpectations();
|
| SetAssociateExpectations();
|
| SetActivateExpectations();
|
| - EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).
|
| - WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
|
|
| @@ -129,8 +125,6 @@ TEST_F(ThemeDataTypeControllerTest,
|
| StartAssociationTriggersUnrecoverableError) {
|
| SetStartExpectations();
|
| // Set up association to fail with an unrecoverable error.
|
| - EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).
|
| - WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(true)));
|
| EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(false), Return(false)));
|
| EXPECT_CALL(start_callback_, Run(DataTypeController::UNRECOVERABLE_ERROR));
|
| @@ -158,8 +152,6 @@ TEST_F(ThemeDataTypeControllerTest, OnUnrecoverableError) {
|
| SetStartExpectations();
|
| SetAssociateExpectations();
|
| SetActivateExpectations();
|
| - EXPECT_CALL(*model_associator_, ChromeModelHasUserCreatedNodes(_)).
|
| - WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| EXPECT_CALL(service_, OnUnrecoverableError(_,_)).
|
|
|