| Index: chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/sync/glue/preference_data_type_controller_unittest.cc (revision 48898)
|
| +++ chrome/browser/sync/glue/preference_data_type_controller_unittest.cc (working copy)
|
| @@ -8,6 +8,7 @@
|
| #include "base/message_loop.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/task.h"
|
| +#include "base/tracked_objects.h"
|
| #include "chrome/browser/chrome_thread.h"
|
| #include "chrome/browser/sync/glue/preference_data_type_controller.h"
|
| #include "chrome/browser/sync/glue/change_processor_mock.h"
|
| @@ -21,7 +22,7 @@
|
| using browser_sync::ModelAssociatorMock;
|
| using testing::_;
|
| using testing::DoAll;
|
| -using testing::Invoke;
|
| +using testing::InvokeWithoutArgs;
|
| using testing::Return;
|
| using testing::SetArgumentPointee;
|
|
|
| @@ -159,13 +160,13 @@
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| EXPECT_CALL(*model_associator_, SyncModelHasUserCreatedNodes(_)).
|
| WillRepeatedly(DoAll(SetArgumentPointee<0>(true), Return(true)));
|
| - EXPECT_CALL(service_, OnUnrecoverableError()).
|
| - WillOnce(Invoke(preference_dtc_.get(),
|
| - &PreferenceDataTypeController::Stop));
|
| + EXPECT_CALL(service_, OnUnrecoverableError(_,_)).
|
| + WillOnce(InvokeWithoutArgs(preference_dtc_.get(),
|
| + &PreferenceDataTypeController::Stop));
|
| SetStopExpectations();
|
|
|
| EXPECT_CALL(start_callback_, Run(DataTypeController::OK));
|
| preference_dtc_->Start(NewCallback(&start_callback_, &StartCallback::Run));
|
| // This should cause preference_dtc_->Stop() to be called.
|
| - preference_dtc_->OnUnrecoverableError();
|
| + preference_dtc_->OnUnrecoverableError(FROM_HERE, "Test");
|
| }
|
|
|