Added tests for views flavor of MediaGalleriesDialogTest.

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/gtk/extensions/media_galleries_dialog_gtk_unittest.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
similarity index 85%
copy from chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc
copy to chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
index 7a644170b2c8bf700a3f267fed1ae60e3c23bfac..dfe0372f45b87f3ea874112fd7c5f13dab92bbd9 100644
--- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.

[vandebo (ex-Chrome), 2014/02/11 18:26:24]

no (c)

[Sheridan Rawlins, 2014/02/13 04:57:20]

Done.

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,16 +6,16 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
-#include "chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.h"
+#include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.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::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnPointee;
-using ::testing::ReturnRef;
 
 namespace {
 
@@ -72,16 +72,14 @@ TEST_F(MediaGalleriesDialogTest, InitializeCheckboxes) {
   EXPECT_CALL(controller, UnattachedPermissions()).
       WillRepeatedly(Return(unattached_permissions));
 
-  MediaGalleriesDialogGtk dialog(&controller);
+  MediaGalleriesDialogViews dialog(&controller);
   EXPECT_EQ(2U, dialog.checkbox_map_.size());
 
-  GtkWidget* checkbox1 = dialog.checkbox_map_[1];
-  ASSERT_TRUE(GTK_IS_TOGGLE_BUTTON(checkbox1));
-  EXPECT_TRUE(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox1)));
+  views::Checkbox* checkbox1 = dialog.checkbox_map_[1];
+  EXPECT_TRUE(checkbox1->checked());
 
-  GtkWidget* checkbox2 = dialog.checkbox_map_[2];
-  ASSERT_TRUE(GTK_IS_TOGGLE_BUTTON(checkbox2));
-  EXPECT_FALSE(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox2)));
+  views::Checkbox* checkbox2 = dialog.checkbox_map_[2];
+  EXPECT_FALSE(checkbox2->checked());
 }
 
 // Tests that toggling checkboxes updates the controller.
@@ -100,18 +98,18 @@ TEST_F(MediaGalleriesDialogTest, ToggleCheckboxes) {
   EXPECT_CALL(controller, UnattachedPermissions()).
       WillRepeatedly(Return(unattached_permissions));
 
-  MediaGalleriesDialogGtk dialog(&controller);
+  MediaGalleriesDialogViews dialog(&controller);
   EXPECT_EQ(1U, dialog.checkbox_map_.size());
-  GtkWidget* checkbox =
-      dialog.checkbox_map_[1];
-  ASSERT_TRUE(GTK_IS_TOGGLE_BUTTON(checkbox));
-  EXPECT_TRUE(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)));
+  views::Checkbox* checkbox = dialog.checkbox_map_[1];
+  EXPECT_TRUE(checkbox->checked());
 
   EXPECT_CALL(controller, DidToggleGalleryId(1, false));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), FALSE);
+  checkbox->SetChecked(false);
+  dialog.ButtonPressedAction(checkbox);
 
   EXPECT_CALL(controller, DidToggleGalleryId(1, true));
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox), TRUE);
+  checkbox->SetChecked(true);
+  dialog.ButtonPressedAction(checkbox);
 }
 
 // Tests that UpdateGallery will add a new checkbox, but only if it refers to
@@ -128,7 +126,7 @@ TEST_F(MediaGalleriesDialogTest, UpdateAdds) {
   EXPECT_CALL(controller, UnattachedPermissions()).
       WillRepeatedly(Return(unattached_permissions));
 
-  MediaGalleriesDialogGtk dialog(&controller);
+  MediaGalleriesDialogViews dialog(&controller);
 
   EXPECT_TRUE(dialog.checkbox_map_.empty());
 
@@ -162,7 +160,7 @@ TEST_F(MediaGalleriesDialogTest, ForgetDeletes) {
   EXPECT_CALL(controller, UnattachedPermissions()).
       WillRepeatedly(Return(unattached_permissions));
 
-  MediaGalleriesDialogGtk dialog(&controller);
+  MediaGalleriesDialogViews dialog(&controller);
 
   EXPECT_TRUE(dialog.checkbox_map_.empty());