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

Unified Diff: chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc

Issue 310383004: Make a controller interface for media galleries dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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/media_galleries/media_galleries_dialog_controller_mock.cc
diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc
index b455811e7a85ab9a96c85645d624f4cad6db5163..364bc3e354f0317d19ab5771850d8849c5fd6e5e 100644
--- a/chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc
+++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc
@@ -4,28 +4,22 @@
#include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
-#include "base/bind.h"
-#include "base/bind_helpers.h"
+#include "base/strings/utf_string_conversions.h"
+using ::testing::_;
using ::testing::Return;
-namespace {
-MediaGalleriesDialog* NullDialog(MediaGalleriesDialogController*) {
- return NULL;
-}
-
-} // namespace
-
-MediaGalleriesDialogControllerMock::MediaGalleriesDialogControllerMock(
- const extensions::Extension& extension)
- : MediaGalleriesDialogController(
- extension, NULL,
- base::Bind(&NullDialog),
- base::Bind(&base::DoNothing)) {
- EXPECT_CALL(*this, GetHeader()).
- WillRepeatedly(Return(base::string16()));
- EXPECT_CALL(*this, GetSubtext()).
- WillRepeatedly(Return(base::string16()));
+MediaGalleriesDialogControllerMock::MediaGalleriesDialogControllerMock() {
+ ON_CALL(*this, GetHeader()).
+ WillByDefault(Return(base::ASCIIToUTF16("Title")));
+ ON_CALL(*this, GetSubtext()).
+ WillByDefault(Return(base::ASCIIToUTF16("Desc")));
+ ON_CALL(*this, GetAcceptButtonText()).
+ WillByDefault(Return(base::ASCIIToUTF16("OK")));
+ ON_CALL(*this, GetAuxiliaryButtonText()).
+ WillByDefault(Return(base::ASCIIToUTF16("Button")));
+ ON_CALL(*this, GetSectionEntries(_)).
+ WillByDefault(Return(Entries()));
}
MediaGalleriesDialogControllerMock::~MediaGalleriesDialogControllerMock() {

Powered by Google App Engine
This is Rietveld 408576698