Material Page Info (Views, 1/3): Rename {ChosenObject, PermissionSelector}View classes to {...}Row.

chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
index 9a736bc649d58f2f7caf7b26e1ee00ce3dae31fa..5d30154c51c7a9cd2459098ce8d555c1938a64a0 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view_unittest.cc
@@ -6,8 +6,8 @@
 
 #include "base/macros.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
-#include "chrome/browser/ui/views/website_settings/chosen_object_view.h"
-#include "chrome/browser/ui/views/website_settings/permission_selector_view.h"
+#include "chrome/browser/ui/views/website_settings/chosen_object_row.h"
+#include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/test/base/testing_profile.h"
@@ -54,8 +54,8 @@ class WebsiteSettingsPopupViewTestApi {
   WebsiteSettingsPopupView* view() { return view_; }
   views::View* permissions_content() { return view_->permissions_content_; }
 
-  PermissionSelectorView* GetPermissionSelectorAt(int index) {
-    return static_cast<PermissionSelectorView*>(
+  PermissionSelectorRow* GetPermissionSelectorAt(int index) {
+    return static_cast<PermissionSelectorRow*>(
         permissions_content()->child_at(index));
   }
 
@@ -151,8 +151,8 @@ class WebsiteSettingsPopupViewTest : public testing::Test {
 }  // namespace
 
 // TODO(ellyjones): re-enable this test for OSX.
-// This test exercises PermissionSelectorView in a way that it is not used in
-// practice. In practice, every setting in PermissionSelectorView starts off
+// This test exercises PermissionSelectorRow in a way that it is not used in
+// practice. In practice, every setting in PermissionSelectorRow starts off
 // "set", so there is always one option checked in the resulting MenuModel. This
 // test creates settings that are left at their defaults, leading to zero
 // checked options, and checks that the text on the MenuButtons is right. Since
@@ -181,7 +181,7 @@ TEST_F(WebsiteSettingsPopupViewTest, MAYBE_SetPermissionInfo) {
   api_->SetPermissionInfo(list);
   EXPECT_EQ(kExpectedChildren, api_->permissions_content()->child_count());
 
-  PermissionSelectorView* selector = api_->GetPermissionSelectorAt(0);
+  PermissionSelectorRow* selector = api_->GetPermissionSelectorAt(0);
   EXPECT_EQ(3, selector->child_count());
 
   // Verify labels match the settings on the PermissionInfoList.
@@ -239,7 +239,7 @@ TEST_F(WebsiteSettingsPopupViewTest, SetPermissionInfoWithUsbDevice) {
   api_->SetPermissionInfo(list);
   EXPECT_EQ(kExpectedChildren + 1, api_->permissions_content()->child_count());
 
-  ChosenObjectView* object_view = static_cast<ChosenObjectView*>(
+  ChosenObjectRow* object_view = static_cast<ChosenObjectRow*>(
       api_->permissions_content()->child_at(kExpectedChildren));
   EXPECT_EQ(3, object_view->child_count());