Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4657)

Unified Diff: chrome/browser/protector/mock_setting_change.cc

Issue 9968007: [protector] Support for collapsing multiple changes into a single one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « chrome/browser/protector/mock_setting_change.h ('k') | chrome/browser/protector/prefs_backup_invalid_change.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698