Make a controller interface for media galleries dialogs.

chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
index 63791cea8e238eb9404c82fb4ea499c7263dbad1..f4b41c95837baf26290640bd0a155355fc42865d 100644
--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h"
 
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
@@ -11,10 +12,10 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/test/test_utils.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ::testing::_;
+using ::testing::AnyNumber;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ -26,22 +27,21 @@ class MediaGalleriesDialogBrowserTest : public InProcessBrowserTest {
 // Verify that programatically closing the constrained window correctly closes
 // the sheet.
 IN_PROC_BROWSER_TEST_F(MediaGalleriesDialogBrowserTest, Close) {
-  scoped_refptr<extensions::Extension> dummy_extension =
-      extensions::test_util::CreateExtensionWithID("dummy");
-  NiceMock<MediaGalleriesDialogControllerMock> controller(*dummy_extension);
+  NiceMock<MediaGalleriesDialogControllerMock> controller;
 
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_CALL(controller, web_contents()).
+  EXPECT_CALL(controller, WebContents()).
       WillRepeatedly(Return(web_contents));
-
-  MediaGalleriesDialogController::GalleryPermissionsVector attached_permissions;
-  EXPECT_CALL(controller, AttachedPermissions()).
-      WillRepeatedly(Return(attached_permissions));
-  MediaGalleriesDialogController::GalleryPermissionsVector
-      unattached_permissions;
-  EXPECT_CALL(controller, UnattachedPermissions()).
-      WillRepeatedly(Return(unattached_permissions));
+  std::vector<base::string16> headers;
+  headers.push_back(base::string16());  // The first section has no header.
+  headers.push_back(base::ASCIIToUTF16("header2"));
+  ON_CALL(controller, GetSectionHeaders()).
+      WillByDefault(Return(headers));
+  EXPECT_CALL(controller, GetAuxiliaryButtonText()).
+      WillRepeatedly(Return(base::ASCIIToUTF16("button")));
+  EXPECT_CALL(controller, GetSectionEntries(_)).
+      Times(AnyNumber());
 
   scoped_ptr<MediaGalleriesDialogCocoa> dialog(
       static_cast<MediaGalleriesDialogCocoa*>(