Make a controller interface for media galleries dialogs.

chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc

Index: chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
index 979db62963baaacaf9a3d02a450cf76a59fac3c0..04afb9f74d54294c626df44cb3d33e7ac8e1acde 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -8,12 +8,12 @@
 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
 #include "components/storage_monitor/storage_info.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/button/checkbox.h"
 
 using ::testing::_;
+using ::testing::AnyNumber;
+using ::testing::Mock;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnPointee;
@@ -37,18 +37,26 @@ class MediaGalleriesDialogTest : public testing::Test {
   MediaGalleriesDialogTest() {}
   virtual ~MediaGalleriesDialogTest() {}
   virtual void SetUp() OVERRIDE {
-    dummy_extension_ = extensions::test_util::CreateExtensionWithID("dummy");
+    std::vector<base::string16> headers;
+    headers.push_back(base::string16());
+    headers.push_back(base::ASCIIToUTF16("header2"));
+    ON_CALL(controller_, GetSectionHeaders()).
+        WillByDefault(Return(headers));
+    EXPECT_CALL(controller_, GetSectionEntries(_)).
+        Times(AnyNumber());
   }
+
   virtual void TearDown() OVERRIDE {
-    dummy_extension_ = NULL;
+    Mock::VerifyAndClearExpectations(&controller_);
   }
 
-  const extensions::Extension& dummy_extension() const {
-    return *dummy_extension_;
+  NiceMock<MediaGalleriesDialogControllerMock>* controller() {
+    return &controller_;
   }
 
  private:
-  scoped_refptr<extensions::Extension> dummy_extension_;
+  // TODO(gbillock): Get rid of this mock; make something specialized.
+  NiceMock<MediaGalleriesDialogControllerMock> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogTest);
 };
@@ -56,25 +64,15 @@ class MediaGalleriesDialogTest : public testing::Test {
 // Tests that checkboxes are initialized according to the contents of
 // permissions in the registry.
 TEST_F(MediaGalleriesDialogTest, InitializeCheckboxes) {
-  // TODO(gbillock): Get rid of this mock; make something specialized.
-  NiceMock<MediaGalleriesDialogControllerMock> controller(dummy_extension());
-
-  MediaGalleriesDialogController::GalleryPermissionsVector attached_permissions;
+  MediaGalleriesDialogController::Entries attached_permissions;
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(
-          1, MakePrefInfoForTesting(10), true));
+      MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(1), true));
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(
-          2, MakePrefInfoForTesting(20), false));
-  EXPECT_CALL(controller, AttachedPermissions()).
+      MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(2), false));
+  EXPECT_CALL(*controller(), GetSectionEntries(0)).
       WillRepeatedly(Return(attached_permissions));
 
-  MediaGalleriesDialogController::GalleryPermissionsVector
-      unattached_permissions;
-  EXPECT_CALL(controller, UnattachedPermissions()).
-      WillRepeatedly(Return(unattached_permissions));
-
-  MediaGalleriesDialogViews dialog(&controller);
+  MediaGalleriesDialogViews dialog(controller());
   EXPECT_EQ(2U, dialog.checkbox_map_.size());
 
   MediaGalleryCheckboxView* checkbox_view1 = dialog.checkbox_map_[1];
@@ -86,31 +84,23 @@ TEST_F(MediaGalleriesDialogTest, InitializeCheckboxes) {
 
 // Tests that toggling checkboxes updates the controller.
 TEST_F(MediaGalleriesDialogTest, ToggleCheckboxes) {
-  NiceMock<MediaGalleriesDialogControllerMock> controller(dummy_extension());
-
-  MediaGalleriesDialogController::GalleryPermissionsVector attached_permissions;
+  MediaGalleriesDialogController::Entries attached_permissions;
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(
-          1, MakePrefInfoForTesting(10), true));
-  EXPECT_CALL(controller, AttachedPermissions()).
+      MediaGalleriesDialogController::Entry(MakePrefInfoForTesting(1), true));
+  EXPECT_CALL(*controller(), GetSectionEntries(0)).
       WillRepeatedly(Return(attached_permissions));
 
-  MediaGalleriesDialogController::GalleryPermissionsVector
-      unattached_permissions;
-  EXPECT_CALL(controller, UnattachedPermissions()).
-      WillRepeatedly(Return(unattached_permissions));
-
-  MediaGalleriesDialogViews dialog(&controller);
+  MediaGalleriesDialogViews dialog(controller());
   EXPECT_EQ(1U, dialog.checkbox_map_.size());
   views::Checkbox* checkbox = dialog.checkbox_map_[1]->checkbox();
   EXPECT_TRUE(checkbox->checked());
 
   ui::KeyEvent dummy_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::EF_NONE, false);
-  EXPECT_CALL(controller, DidToggleGallery(1, false));
+  EXPECT_CALL(*controller(), DidToggleEntry(1, false));
   checkbox->SetChecked(false);
   dialog.ButtonPressed(checkbox, dummy_event);
 
-  EXPECT_CALL(controller, DidToggleGallery(1, true));
+  EXPECT_CALL(*controller(), DidToggleEntry(1, true));
   checkbox->SetChecked(true);
   dialog.ButtonPressed(checkbox, dummy_event);
 }
@@ -118,64 +108,50 @@ TEST_F(MediaGalleriesDialogTest, ToggleCheckboxes) {
 // Tests that UpdateGallery will add a new checkbox, but only if it refers to
 // a gallery that the dialog hasn't seen before.
 TEST_F(MediaGalleriesDialogTest, UpdateAdds) {
-  NiceMock<MediaGalleriesDialogControllerMock> controller(dummy_extension());
+  MediaGalleriesDialogViews dialog(controller());
 
-  MediaGalleriesDialogController::GalleryPermissionsVector attached_permissions;
-  EXPECT_CALL(controller, AttachedPermissions()).
+  MediaGalleriesDialogController::Entries attached_permissions;
+  EXPECT_CALL(*controller(), GetSectionEntries(0)).
       WillRepeatedly(ReturnPointee(&attached_permissions));
 
-  MediaGalleriesDialogController::GalleryPermissionsVector
-      unattached_permissions;
-  EXPECT_CALL(controller, UnattachedPermissions()).
-      WillRepeatedly(Return(unattached_permissions));
-
-  MediaGalleriesDialogViews dialog(&controller);
-
   EXPECT_TRUE(dialog.checkbox_map_.empty());
 
-  MediaGalleryPrefInfo gallery1 = MakePrefInfoForTesting(10);
+  MediaGalleryPrefInfo gallery1 = MakePrefInfoForTesting(1);
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(1, gallery1, true));
+      MediaGalleriesDialogController::Entry(gallery1, true));
   dialog.UpdateGalleries();
   EXPECT_EQ(1U, dialog.checkbox_map_.size());
 
-  MediaGalleryPrefInfo gallery2 = MakePrefInfoForTesting(20);
+  MediaGalleryPrefInfo gallery2 = MakePrefInfoForTesting(2);
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(2, gallery2, true));
+      MediaGalleriesDialogController::Entry(gallery2, true));
   dialog.UpdateGalleries();
   EXPECT_EQ(2U, dialog.checkbox_map_.size());
 
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(2, gallery2, false));
+      MediaGalleriesDialogController::Entry(gallery2, false));
   dialog.UpdateGalleries();
   EXPECT_EQ(2U, dialog.checkbox_map_.size());
 }
 
 TEST_F(MediaGalleriesDialogTest, ForgetDeletes) {
-  NiceMock<MediaGalleriesDialogControllerMock> controller(dummy_extension());
+  MediaGalleriesDialogViews dialog(controller());
 
-  MediaGalleriesDialogController::GalleryPermissionsVector attached_permissions;
-  EXPECT_CALL(controller, AttachedPermissions()).
+  MediaGalleriesDialogController::Entries attached_permissions;
+  EXPECT_CALL(*controller(), GetSectionEntries(0)).
       WillRepeatedly(ReturnPointee(&attached_permissions));
 
-  MediaGalleriesDialogController::GalleryPermissionsVector
-      unattached_permissions;
-  EXPECT_CALL(controller, UnattachedPermissions()).
-      WillRepeatedly(Return(unattached_permissions));
-
-  MediaGalleriesDialogViews dialog(&controller);
-
   EXPECT_TRUE(dialog.checkbox_map_.empty());
 
-  MediaGalleryPrefInfo gallery1 = MakePrefInfoForTesting(10);
+  MediaGalleryPrefInfo gallery1 = MakePrefInfoForTesting(1);
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(1, gallery1, true));
+      MediaGalleriesDialogController::Entry(gallery1, true));
   dialog.UpdateGalleries();
   EXPECT_EQ(1U, dialog.checkbox_map_.size());
 
-  MediaGalleryPrefInfo gallery2 = MakePrefInfoForTesting(20);
+  MediaGalleryPrefInfo gallery2 = MakePrefInfoForTesting(2);
   attached_permissions.push_back(
-      MediaGalleriesDialogController::GalleryPermission(2, gallery2, true));
+      MediaGalleriesDialogController::Entry(gallery2, true));
   dialog.UpdateGalleries();
   EXPECT_EQ(2U, dialog.checkbox_map_.size());