Make a controller interface for media galleries dialogs.

chrome/browser/media_galleries/media_galleries_dialog_controller_mock.cc

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..c85a3710c45f01e2ff815656dcf020e0d3cddad2 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,20 @@
 
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
 
-#include "base/bind.h"
-#include "base/bind_helpers.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::string16()));
+  ON_CALL(*this, GetSubtext()).
+      WillByDefault(Return(base::string16()));
+  ON_CALL(*this, GetAcceptButtonText()).
+      WillByDefault(Return(base::string16()));
+  ON_CALL(*this, GetAuxilliaryButtonText()).
+      WillByDefault(Return(base::string16()));
+  ON_CALL(*this, GetSectionEntries(_)).
+      WillByDefault(Return(Entries()));
 }
 
 MediaGalleriesDialogControllerMock::~MediaGalleriesDialogControllerMock() {