| Index: chrome/browser/protector/mock_protector_service.h
|
| diff --git a/chrome/browser/protector/mock_protector_service.h b/chrome/browser/protector/mock_protector_service.h
|
| index bc2c36f62ce3cae74bb50feae4fecbe94325dd10..8e463fd7ea54ee4cebf27e47ad147e01110fd5cb 100644
|
| --- a/chrome/browser/protector/mock_protector_service.h
|
| +++ b/chrome/browser/protector/mock_protector_service.h
|
| @@ -25,16 +25,17 @@ class MockProtectorService : public ProtectorService {
|
| MOCK_METHOD1(ShowChange, void(BaseSettingChange*));
|
| MOCK_CONST_METHOD0(IsShowingChange, bool());
|
|
|
| - MOCK_METHOD0(DismissChange, void());
|
| - MOCK_METHOD1(ApplyChange, void(Browser*));
|
| - MOCK_METHOD1(DiscardChange, void(Browser*));
|
| + MOCK_METHOD1(DismissChange, void(BaseSettingChange* change));
|
| + MOCK_METHOD2(ApplyChange, void(BaseSettingChange* change, Browser*));
|
| + MOCK_METHOD2(DiscardChange, void(BaseSettingChange* change, Browser*));
|
|
|
| MOCK_METHOD2(OpenTab, void(const GURL&, Browser*));
|
|
|
| - MOCK_METHOD1(OnApplyChange, void(Browser*));
|
| - MOCK_METHOD1(OnDiscardChange, void(Browser*));
|
| - MOCK_METHOD0(OnDecisionTimeout, void());
|
| - MOCK_METHOD0(OnRemovedFromProfile, void());
|
| + MOCK_METHOD2(OnApplyChange, void(SettingsChangeGlobalError* error, Browser*));
|
| + MOCK_METHOD2(OnDiscardChange, void(SettingsChangeGlobalError* error,
|
| + Browser*));
|
| + MOCK_METHOD1(OnDecisionTimeout, void(SettingsChangeGlobalError* error));
|
| + MOCK_METHOD1(OnRemovedFromProfile, void(SettingsChangeGlobalError* error));
|
|
|
| MOCK_METHOD0(Shutdown, void());
|
| };
|
|
|