| Index: chrome/browser/protector/mock_setting_change.cc
|
| diff --git a/chrome/browser/protector/mock_setting_change.cc b/chrome/browser/protector/mock_setting_change.cc
|
| index 53bc9f3e7449ca0d096ec5a31663018670a60bfb..34581e0836f6041a95f00c22600d2cc8b3420461 100644
|
| --- a/chrome/browser/protector/mock_setting_change.cc
|
| +++ b/chrome/browser/protector/mock_setting_change.cc
|
| @@ -25,6 +25,13 @@ MockSettingChange::MockSettingChange() {
|
| WillByDefault(Return(UTF8ToUTF16("Apply")));
|
| ON_CALL(*this, GetDiscardButtonText()).
|
| WillByDefault(Return(UTF8ToUTF16("Discard")));
|
| +
|
| + ON_CALL(*this, GetApplyDisplayName()).
|
| + WillByDefault(Return(
|
| + DisplayName(kDefaultNamePriority, UTF8ToUTF16("new settings"))));
|
| +
|
| + ON_CALL(*this, GetNewSettingURL()).WillByDefault(Return(GURL()));
|
| + ON_CALL(*this, CanBeMerged()).WillByDefault(Return(false));
|
| }
|
|
|
| MockSettingChange::~MockSettingChange() {
|
|
|