Remove support for single-param METADATA_HEADER macro and 3-param BEGIN_METADATA macro.

Bug: 1485768
Change-Id: I3f3054d5311a463985b71df5110abe84c1ce0547
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5299618
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1261950}

ash/app_list/views/app_list_item_view.cc

@@ -529,7 +529,7 @@ class AppListItemView::FolderIconView : public views::View,
   std::string dragged_item_id_;
 };
 
-BEGIN_METADATA(AppListItemView, FolderIconView, views::View)
+BEGIN_METADATA(AppListItemView, FolderIconView)
 END_METADATA
 
 AppListItemView::AppListItemView(const AppListConfig* app_list_config,

ash/app_list/views/app_list_toast_view.cc

@@ -405,7 +405,7 @@ void AppListToastView::ToastPillButton::OnBlur() {
   views::FocusRing::Get(this)->SchedulePaint();
 }
 
-BEGIN_METADATA(AppListToastView, ToastPillButton, PillButton)
+BEGIN_METADATA(AppListToastView, ToastPillButton)
 END_METADATA
 
 void AppListToastView::UpdateIconImage() {

ash/app_list/views/apps_container_view.cc

@@ -232,7 +232,7 @@ class AppsContainerView::ContinueContainer : public views::View {
   raw_ptr<views::Separator, DanglingUntriaged> separator_ = nullptr;
 };
 
-BEGIN_METADATA(AppsContainerView, ContinueContainer, views::View)
+BEGIN_METADATA(AppsContainerView, ContinueContainer)
 END_METADATA
 
 const int AppsContainerView::kHorizontalMargin = 24;

ash/app_list/views/folder_header_view.cc

@@ -267,7 +267,7 @@ class FolderHeaderView::FolderNameView : public views::Textfield,
   bool has_mouse_already_entered_ = false;
 };
 
-BEGIN_METADATA(FolderHeaderView, FolderNameView, views::Textfield)
+BEGIN_METADATA(FolderHeaderView, FolderNameView)
 END_METADATA
 
 class FolderHeaderView::FolderNameJellyView
@@ -352,7 +352,7 @@ class FolderHeaderView::FolderNameJellyView
   std::u16string starting_name_;
 };
 
-BEGIN_METADATA(FolderHeaderView, FolderNameJellyView, ash::SystemTextfield)
+BEGIN_METADATA(FolderHeaderView, FolderNameJellyView)
 END_METADATA
 
 class FolderHeaderView::FolderNameViewController

ash/clipboard/views/clipboard_history_bitmap_item_view.cc

@@ -150,7 +150,7 @@ class FadeImageView : public views::ImageView,
   base::CallbackListSubscription display_image_updated_subscription_;
 };
 
-BEGIN_METADATA(FadeImageView, views::ImageView)
+BEGIN_METADATA(FadeImageView)
 END_METADATA
 
 }  // namespace
@@ -315,7 +315,7 @@ class ClipboardHistoryBitmapItemView::BitmapContentsView
   raw_ptr<views::ImageView> image_view_ = nullptr;
 };
 
-BEGIN_METADATA(ClipboardHistoryBitmapItemView, BitmapContentsView, ContentsView)
+BEGIN_METADATA(ClipboardHistoryBitmapItemView, BitmapContentsView)
 END_METADATA
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -348,7 +348,7 @@ ClipboardHistoryBitmapItemView::CreateContentsView() {
   return std::make_unique<BitmapContentsView>(this);
 }
 
-BEGIN_METADATA(ClipboardHistoryBitmapItemView, ClipboardHistoryItemView)
+BEGIN_METADATA(ClipboardHistoryBitmapItemView)
 END_METADATA
 
 }  // namespace ash

ash/clipboard/views/clipboard_history_item_view.cc

@@ -526,13 +526,13 @@ void ClipboardHistoryItemView::SetPseudoFocus(PseudoFocus new_pseudo_focus) {
   }
 }
 
-BEGIN_METADATA(ClipboardHistoryItemView, ContentsView, views::View)
+BEGIN_METADATA(ClipboardHistoryItemView, ContentsView)
 END_METADATA
 
-BEGIN_METADATA(ClipboardHistoryItemView, DisplayView, views::View)
+BEGIN_METADATA(ClipboardHistoryItemView, DisplayView)
 END_METADATA
 
-BEGIN_METADATA(ClipboardHistoryItemView, views::View)
+BEGIN_METADATA(ClipboardHistoryItemView)
 END_METADATA
 
 }  // namespace ash

ash/clipboard/views/clipboard_history_text_item_view.cc

@@ -135,7 +135,7 @@ class ClipboardHistoryTextItemView::TextContentsView
   }
 };
 
-BEGIN_METADATA(ClipboardHistoryTextItemView, TextContentsView, ContentsView)
+BEGIN_METADATA(ClipboardHistoryTextItemView, TextContentsView)
 END_METADATA
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,7 @@ ClipboardHistoryTextItemView::CreateContentsView() {
   return std::make_unique<TextContentsView>(this);
 }
 
-BEGIN_METADATA(ClipboardHistoryTextItemView, ClipboardHistoryItemView)
+BEGIN_METADATA(ClipboardHistoryTextItemView)
 END_METADATA
 
 }  // namespace ash

ash/components/arc/compat_mode/resize_toggle_menu.cc

@@ -214,7 +214,7 @@ void ResizeToggleMenu::MenuButtonView::UpdateColors() {
   GetBorder()->set_color(border_color);
 }
 
-BEGIN_METADATA(ResizeToggleMenu, MenuButtonView, views::Button)
+BEGIN_METADATA(ResizeToggleMenu, MenuButtonView)
 END_METADATA
 
 ResizeToggleMenu::ResizeToggleMenu(

ash/game_dashboard/game_dashboard_main_menu_view.cc

@@ -255,7 +255,7 @@ class FeatureHeader : public views::View {
   raw_ptr<views::Label> sub_title_ = nullptr;
 };
 
-BEGIN_METADATA(FeatureHeader, views::View)
+BEGIN_METADATA(FeatureHeader)
 END_METADATA
 
 // -----------------------------------------------------------------------------
@@ -266,7 +266,7 @@ END_METADATA
 // | |feature header|                           |>| |
 // +------------------------------------------------+
 class ScreenSizeRow : public views::Button {
-  METADATA_HEADER(ScreenSizeRow, views::View)
+  METADATA_HEADER(ScreenSizeRow, views::Button)
 
  public:
   ScreenSizeRow(PressedCallback callback,
@@ -317,7 +317,7 @@ class ScreenSizeRow : public views::Button {
   ~ScreenSizeRow() override = default;
 };
 
-BEGIN_METADATA(ScreenSizeRow, views::Button)
+BEGIN_METADATA(ScreenSizeRow)
 END_METADATA
 
 }  // namespace
@@ -493,7 +493,7 @@ class GameDashboardMainMenuView::GameControlsDetailsRow : public views::Button {
   std::string app_name_;
 };
 
-BEGIN_METADATA(GameDashboardMainMenuView, GameControlsDetailsRow, views::Button)
+BEGIN_METADATA(GameDashboardMainMenuView, GameControlsDetailsRow)
 END_METADATA
 
 // -----------------------------------------------------------------------------

ash/glanceables/tasks/glanceables_task_view.cc

@@ -147,7 +147,7 @@ class GlanceablesTaskView::CheckButton : public views::ImageButton {
   bool checked_ = false;
 };
 
-BEGIN_METADATA(GlanceablesTaskView, CheckButton, views::ImageButton)
+BEGIN_METADATA(GlanceablesTaskView, CheckButton)
 END_METADATA
 
 class GlanceablesTaskView::TaskTitleButton : public views::LabelButton {
@@ -179,7 +179,7 @@ class GlanceablesTaskView::TaskTitleButton : public views::LabelButton {
   }
 };
 
-BEGIN_METADATA(GlanceablesTaskView, TaskTitleButton, views::LabelButton)
+BEGIN_METADATA(GlanceablesTaskView, TaskTitleButton)
 END_METADATA
 
 GlanceablesTaskView::GlanceablesTaskView(

ash/glanceables/tasks/glanceables_task_view_v2.cc

@@ -255,7 +255,7 @@ class GlanceablesTaskViewV2::CheckButton : public views::ImageButton {
   bool checked_ = false;
 };
 
-BEGIN_METADATA(GlanceablesTaskViewV2, CheckButton, views::ImageButton)
+BEGIN_METADATA(GlanceablesTaskViewV2, CheckButton)
 END_METADATA
 
 class GlanceablesTaskViewV2::TaskTitleButton : public views::LabelButton {
@@ -284,7 +284,7 @@ class GlanceablesTaskViewV2::TaskTitleButton : public views::LabelButton {
   }
 };
 
-BEGIN_METADATA(GlanceablesTaskViewV2, TaskTitleButton, views::LabelButton)
+BEGIN_METADATA(GlanceablesTaskViewV2, TaskTitleButton)
 END_METADATA
 
 GlanceablesTaskViewV2::GlanceablesTaskViewV2(

ash/in_session_auth/auth_dialog_contents_view.cc

@@ -298,12 +298,10 @@ class AuthDialogContentsView::FingerprintView : public views::View {
   base::OneShotTimer reset_state_;
 };
 
-BEGIN_METADATA(AuthDialogContentsView, FingerprintView, views::View)
+BEGIN_METADATA(AuthDialogContentsView, FingerprintView)
 END_METADATA
 
-BEGIN_METADATA(AuthDialogContentsView::FingerprintView,
-               FingerprintLabel,
-               views::Label)
+BEGIN_METADATA(AuthDialogContentsView::FingerprintView, FingerprintLabel)
 END_METADATA
 
 class AuthDialogContentsView::TitleLabel : public views::Label {
@@ -358,7 +356,7 @@ class AuthDialogContentsView::TitleLabel : public views::Label {
   bool is_showing_error_ = false;
 };
 
-BEGIN_METADATA(AuthDialogContentsView, TitleLabel, views::Label)
+BEGIN_METADATA(AuthDialogContentsView, TitleLabel)
 END_METADATA
 
 AuthDialogContentsView::AuthDialogContentsView(

ash/lock_screen_action/lock_screen_action_background_view.cc

@@ -73,7 +73,7 @@ class LockScreenActionBackgroundView::NoteBackground : public views::View {
   raw_ptr<views::InkDropObserver> observer_;
 };
 
-BEGIN_METADATA(LockScreenActionBackgroundView, NoteBackground, views::View)
+BEGIN_METADATA(LockScreenActionBackgroundView, NoteBackground)
 END_METADATA
 
 LockScreenActionBackgroundView::LockScreenActionBackgroundView() {

ash/login/ui/login_auth_user_view.cc

@@ -346,7 +346,7 @@ class LoginAuthUserView::ChallengeResponseView : public views::View {
   base::OneShotTimer reset_state_timer_;
 };
 
-BEGIN_METADATA(LoginAuthUserView, ChallengeResponseView, views::View)
+BEGIN_METADATA(LoginAuthUserView, ChallengeResponseView)
 END_METADATA
 
 LoginAuthUserView::AuthMethodsMetadata::AuthMethodsMetadata() = default;

ash/login/ui/login_password_view.cc

@@ -166,7 +166,7 @@ class LoginPasswordView::LoginPasswordRow : public views::View {
   LoginPasswordRow& operator=(const LoginPasswordRow&) = delete;
 };
 
-BEGIN_METADATA(LoginPasswordView, LoginPasswordRow, views::View)
+BEGIN_METADATA(LoginPasswordView, LoginPasswordRow)
 END_METADATA
 
 // A textfield that selects all text on focus and allows to switch between
@@ -254,7 +254,7 @@ class LoginPasswordView::LoginTextfield : public views::Textfield {
   base::RepeatingClosure on_tab_focus_closure_;
 };
 
-BEGIN_METADATA(LoginPasswordView, LoginTextfield, views::Textfield)
+BEGIN_METADATA(LoginPasswordView, LoginTextfield)
 END_METADATA
 
 class LoginPasswordView::DisplayPasswordButton
@@ -298,9 +298,7 @@ class LoginPasswordView::DisplayPasswordButton
   ~DisplayPasswordButton() override = default;
 };
 
-BEGIN_METADATA(LoginPasswordView,
-               DisplayPasswordButton,
-               views::ToggleImageButton)
+BEGIN_METADATA(LoginPasswordView, DisplayPasswordButton)
 END_METADATA
 
 LoginPasswordView::TestApi::TestApi(LoginPasswordView* view) : view_(view) {}

ash/login/ui/login_pin_view.cc

@@ -261,7 +261,7 @@ class LoginPinView::DigitPinButton : public BasePinButton {
   raw_ptr<views::Label> sub_label_ = nullptr;
 };
 
-BEGIN_METADATA(LoginPinView, DigitPinButton, BasePinButton)
+BEGIN_METADATA(LoginPinView, DigitPinButton)
 END_METADATA
 
 // A PIN button that displays backspace icon.
@@ -407,7 +407,7 @@ class LoginPinView::BackspacePinButton : public BasePinButton {
           base::Unretained(this)));
 };
 
-BEGIN_METADATA(LoginPinView, BackspacePinButton, BasePinButton)
+BEGIN_METADATA(LoginPinView, BackspacePinButton)
 END_METADATA
 
 // A PIN button to press to submit the PIN / password.
@@ -443,7 +443,7 @@ class LoginPinView::SubmitPinButton : public BasePinButton {
                               base::Unretained(this)));
 };
 
-BEGIN_METADATA(LoginPinView, SubmitPinButton, BasePinButton)
+BEGIN_METADATA(LoginPinView, SubmitPinButton)
 END_METADATA
 
 // static

ash/login/ui/login_user_view.cc

@@ -266,7 +266,7 @@ class LoginUserView::UserImage : public NonAccessibleView {
   base::WeakPtrFactory<UserImage> weak_factory_{this};
 };
 
-BEGIN_METADATA(LoginUserView, UserImage, NonAccessibleView)
+BEGIN_METADATA(LoginUserView, UserImage)
 END_METADATA
 
 // Shows the user's name.
@@ -335,7 +335,7 @@ class LoginUserView::UserLabel : public NonAccessibleView {
   const int label_width_;
 };
 
-BEGIN_METADATA(LoginUserView, UserLabel, NonAccessibleView)
+BEGIN_METADATA(LoginUserView, UserLabel)
 END_METADATA
 
 // A button embedded inside of LoginUserView, which is activated whenever the
@@ -373,7 +373,7 @@ class LoginUserView::TapButton : public views::Button {
   const raw_ptr<LoginUserView> parent_;
 };
 
-BEGIN_METADATA(LoginUserView, TapButton, views::Button)
+BEGIN_METADATA(LoginUserView, TapButton)
 END_METADATA
 
 // LoginUserView is defined after LoginUserView::UserLabel so it can access the

ash/login/ui/note_action_launch_button.cc

@@ -165,7 +165,7 @@ class NoteActionLaunchButton::BackgroundView : public NonAccessibleView {
   BubbleLayerDelegate background_layer_delegate_;
 };
 
-BEGIN_METADATA(NoteActionLaunchButton, BackgroundView, NonAccessibleView)
+BEGIN_METADATA(NoteActionLaunchButton, BackgroundView)
 END_METADATA
 
 // The event target delegate used for the note action view. It matches the
@@ -351,7 +351,7 @@ class NoteActionLaunchButton::ActionButton : public views::ImageButton {
   bool tracking_activation_gesture_ = false;
 };
 
-BEGIN_METADATA(NoteActionLaunchButton, ActionButton, views::ImageButton)
+BEGIN_METADATA(NoteActionLaunchButton, ActionButton)
 END_METADATA
 
 NoteActionLaunchButton::TestApi::TestApi(NoteActionLaunchButton* launch_button)

ash/login/ui/pin_request_view.cc

@@ -110,7 +110,7 @@ class PinRequestView::FocusableLabelButton : public views::LabelButton {
   ~FocusableLabelButton() override = default;
 };
 
-BEGIN_METADATA(PinRequestView, FocusableLabelButton, views::LabelButton)
+BEGIN_METADATA(PinRequestView, FocusableLabelButton)
 END_METADATA
 
 PinRequestView::TestApi::TestApi(PinRequestView* view) : view_(view) {

ash/shelf/home_button.cc

@@ -313,7 +313,7 @@ class HomeButton::ButtonImageView : public views::View {
   bool toggled_ = false;
 };
 
-BEGIN_METADATA(HomeButton, ButtonImageView, views::View)
+BEGIN_METADATA(HomeButton, ButtonImageView)
 END_METADATA
 
 // HomeButton::ScopedNoClipRect ------------------------------------------------

ash/shelf/scrollable_shelf_view.cc

@@ -149,7 +149,7 @@ class ScrollableShelfView::ScrollableShelfArrowView
   const raw_ptr<Shelf> shelf_;
 };
 
-BEGIN_METADATA(ScrollableShelfView, ScrollableShelfArrowView, ScrollArrowView)
+BEGIN_METADATA(ScrollableShelfView, ScrollableShelfArrowView)
 END_METADATA
 
 ////////////////////////////////////////////////////////////////////////////////

ash/shelf/shelf_app_button.cc

@@ -230,9 +230,9 @@ class ShelfAppButton::AppStatusIndicatorView
     : public gfx::AnimationDelegate,
       public views::View,
       public ShelfAppButtonAnimation::Observer {
- public:
-  METADATA_HEADER(AppStatusIndicatorView);
+  METADATA_HEADER(AppStatusIndicatorView, views::View)
 
+ public:
   AppStatusIndicatorView()
       : jelly_enabled_(chromeos::features::IsJellyEnabled()) {
     // Make sure the events reach the parent view for handling.
@@ -413,7 +413,7 @@ class ShelfAppButton::AppStatusIndicatorView
   base::TimeTicks animation_end_time_;  // For attention throbbing underline.
 };
 
-BEGIN_METADATA(ShelfAppButton, AppStatusIndicatorView, views::View)
+BEGIN_METADATA(ShelfAppButton, AppStatusIndicatorView)
 END_METADATA
 
 ////////////////////////////////////////////////////////////////////////////////

ash/style/combobox.cc

@@ -251,7 +251,7 @@ class Combobox::ComboboxMenuView : public views::View {
   raw_ptr<views::ScrollView> scroll_view_;
 };
 
-BEGIN_METADATA(Combobox, ComboboxMenuView, views::View)
+BEGIN_METADATA(Combobox, ComboboxMenuView)
 END_METADATA
 
 //------------------------------------------------------------------------------

ash/style/drop_down_checkbox.cc

@@ -189,7 +189,7 @@ class DropDownCheckbox::MenuView : public views::View {
   raw_ptr<CheckboxMenuOptionGroup> menu_item_group_;
 };
 
-BEGIN_METADATA(DropDownCheckbox, MenuView, views::View)
+BEGIN_METADATA(DropDownCheckbox, MenuView)
 END_METADATA
 
 //------------------------------------------------------------------------------

ash/style/pagination_view.cc

@@ -189,7 +189,7 @@ class PaginationView::SelectorDotView : public views::View {
   std::vector<DeformInterval> deform_intervals_;
 };
 
-BEGIN_METADATA(PaginationView, SelectorDotView, views::View)
+BEGIN_METADATA(PaginationView, SelectorDotView)
 END_METADATA
 
 //------------------------------------------------------------------------------
@@ -302,7 +302,7 @@ class PaginationView::IndicatorContainer : public views::BoxLayoutView {
   std::optional<InterpolationInterval<int>> scroll_interval_;
 };
 
-BEGIN_METADATA(PaginationView, IndicatorContainer, views::BoxLayoutView)
+BEGIN_METADATA(PaginationView, IndicatorContainer)
 END_METADATA
 
 //------------------------------------------------------------------------------

ash/style/style_viewer/system_ui_components_style_viewer_view.cc

@@ -144,9 +144,7 @@ class SystemUIComponentsStyleViewerView::ComponentButton
   ui::ColorId text_color_id_ = kInactiveButtonTextColorId;
 };
 
-BEGIN_METADATA(SystemUIComponentsStyleViewerView,
-               ComponentButton,
-               views::LabelButton)
+BEGIN_METADATA(SystemUIComponentsStyleViewerView, ComponentButton)
 END_METADATA
 
 // -----------------------------------------------------------------------------

ash/style/system_dialog_delegate_view.cc

@@ -205,7 +205,7 @@ class SystemDialogDelegateView::ButtonContainer : public views::FlexLayoutView {
   raw_ptr<views::View> place_holder_view_ = nullptr;
 };
 
-BEGIN_METADATA(SystemDialogDelegateView, ButtonContainer, views::FlexLayoutView)
+BEGIN_METADATA(SystemDialogDelegateView, ButtonContainer)
 END_METADATA
 
 //------------------------------------------------------------------------------

ash/style/tab_slider.cc

@@ -94,7 +94,7 @@ class TabSlider::SelectorView : public views::View {
   raw_ptr<TabSliderButton> button_ = nullptr;
 };
 
-BEGIN_METADATA(TabSlider, SelectorView, views::View)
+BEGIN_METADATA(TabSlider, SelectorView)
 END_METADATA
 
 //------------------------------------------------------------------------------

ash/system/accessibility/floating_accessibility_detailed_controller.cc

@@ -36,6 +36,7 @@ constexpr int kDetailedViewHeightDip = 350;
 class FloatingAccessibilityDetailedController::DetailedBubbleView
     : public TrayBubbleView {
   METADATA_HEADER(DetailedBubbleView, TrayBubbleView)
+
  public:
   explicit DetailedBubbleView(TrayBubbleView::InitParams init_params)
       : TrayBubbleView(init_params) {}
@@ -184,9 +185,7 @@ void FloatingAccessibilityDetailedController::OnWindowActivated(
   bubble_widget_->CloseWithReason(views::Widget::ClosedReason::kLostFocus);
 }
 
-BEGIN_METADATA(FloatingAccessibilityDetailedController,
-               DetailedBubbleView,
-               TrayBubbleView)
+BEGIN_METADATA(FloatingAccessibilityDetailedController, DetailedBubbleView)
 END_METADATA
 
 }  // namespace ash

ash/system/focus_mode/focus_mode_task_view.cc

@@ -122,7 +122,7 @@ class FocusModeTaskView::TaskTextfield : public SystemTextfield {
   bool show_selected_state_ = false;
 };
 
-BEGIN_METADATA(FocusModeTaskView, TaskTextfield, SystemTextfield)
+BEGIN_METADATA(FocusModeTaskView, TaskTextfield)
 END_METADATA
 
 //---------------------------------------------------------------------

ash/system/focus_mode/focus_mode_tray.cc

@@ -160,7 +160,7 @@ class FocusModeTray::TaskItemView : public views::BoxLayoutView {
   raw_ptr<views::Label> task_title_ = nullptr;
 };
 
-BEGIN_METADATA(FocusModeTray, TaskItemView, views::BoxLayoutView)
+BEGIN_METADATA(FocusModeTray, TaskItemView)
 END_METADATA
 
 FocusModeTray::FocusModeTray(Shelf* shelf)

ash/system/holding_space/holding_space_tray_bubble.cc

@@ -423,7 +423,7 @@ class HoldingSpaceTrayBubble::ChildBubbleContainer
       view_bounds_changed_observers_by_view_;
 };
 
-BEGIN_METADATA(HoldingSpaceTrayBubble, ChildBubbleContainer, views::View)
+BEGIN_METADATA(HoldingSpaceTrayBubble, ChildBubbleContainer)
 END_METADATA
 
 // HoldingSpaceTrayBubble ------------------------------------------------------

ash/system/media/media_tray.cc

@@ -219,7 +219,7 @@ void MediaTray::PinButton::ButtonPressed() {
           : IDS_ASH_GLOBAL_MEDIA_CONTROLS_UNPINNED_BUTTON_TOOLTIP_TEXT));
 }
 
-BEGIN_METADATA(MediaTray, PinButton, IconButton)
+BEGIN_METADATA(MediaTray, PinButton)
 END_METADATA
 
 MediaTray::MediaTray(Shelf* shelf)

ash/system/media/unified_media_controls_view.cc

@@ -136,7 +136,7 @@ void UnifiedMediaControlsView::MediaActionButton::SetAction(
   SetVectorIcon(GetVectorIconForMediaAction(action));
 }
 
-BEGIN_METADATA(UnifiedMediaControlsView, MediaActionButton, IconButton)
+BEGIN_METADATA(UnifiedMediaControlsView, MediaActionButton)
 END_METADATA
 
 UnifiedMediaControlsView::UnifiedMediaControlsView(

ash/system/notification_center/stacked_notification_bar.cc

@@ -37,9 +37,9 @@ namespace {
 // The label button in the stacked notification bar, used for the "Clear All"
 // button.
 class StackingBarLabelButton : public PillButton {
- public:
-  METADATA_HEADER(StackingBarLabelButton);
+  METADATA_HEADER(StackingBarLabelButton, PillButton)
 
+ public:
   StackingBarLabelButton(PressedCallback callback,
                          const std::u16string& text,
                          NotificationCenterView* notification_center_view)
@@ -59,7 +59,7 @@ class StackingBarLabelButton : public PillButton {
   ~StackingBarLabelButton() override = default;
 };
 
-BEGIN_METADATA(StackingBarLabelButton, PillButton)
+BEGIN_METADATA(StackingBarLabelButton)
 END_METADATA
 
 }  // namespace
@@ -209,9 +209,7 @@ class StackedNotificationBar::StackedNotificationBarIcon
   AnimationCompleteCallback animation_complete_callback_;
 };
 
-BEGIN_METADATA(StackedNotificationBar,
-               StackedNotificationBarIcon,
-               views::ImageView)
+BEGIN_METADATA(StackedNotificationBar, StackedNotificationBarIcon)
 END_METADATA
 
 StackedNotificationBar::StackedNotificationBar(

ash/system/notification_center/views/ash_notification_view.cc

@@ -285,7 +285,7 @@ using CrossAxisAlignment = views::BoxLayout::CrossAxisAlignment;
 using MainAxisAlignment = views::BoxLayout::MainAxisAlignment;
 using Orientation = views::BoxLayout::Orientation;
 
-BEGIN_METADATA(AshNotificationView, NotificationTitleRow, views::View)
+BEGIN_METADATA(AshNotificationView, NotificationTitleRow)
 END_METADATA
 
 void AshNotificationView::AddedToWidget() {
@@ -321,9 +321,7 @@ void AshNotificationView::GroupedNotificationsContainer::
   parent_notification_view_ = parent_notification_view;
 }
 
-BEGIN_METADATA(AshNotificationView,
-               GroupedNotificationsContainer,
-               views::BoxLayoutView)
+BEGIN_METADATA(AshNotificationView, GroupedNotificationsContainer)
 END_METADATA
 
 AshNotificationView::NotificationTitleRow::NotificationTitleRow(

ash/system/notification_center/views/notification_list_view.cc

@@ -413,7 +413,7 @@ class NotificationListView::MessageViewContainer : public MessageView::Observer,
   raw_ptr<MessageView> message_view_;
 };
 
-BEGIN_METADATA(NotificationListView, MessageViewContainer, views::View)
+BEGIN_METADATA(NotificationListView, MessageViewContainer)
 END_METADATA
 
 NotificationListView::NotificationListView(

ash/system/notification_center/views/notifier_settings_view.cc

@@ -543,7 +543,7 @@ void NotifierSettingsView::NotifierButton::GridChanged() {
   DeprecatedLayoutImmediately();
 }
 
-BEGIN_METADATA(NotifierSettingsView, NotifierButton, views::Button)
+BEGIN_METADATA(NotifierSettingsView, NotifierButton)
 END_METADATA
 
 // NotifierSettingsView -------------------------------------------------------

ash/system/palette/palette_welcome_bubble.cc

@@ -74,9 +74,7 @@ class PaletteWelcomeBubble::WelcomeBubbleView
   }
 };
 
-BEGIN_METADATA(PaletteWelcomeBubble,
-               WelcomeBubbleView,
-               views::BubbleDialogDelegateView)
+BEGIN_METADATA(PaletteWelcomeBubble, WelcomeBubbleView)
 END_METADATA
 
 PaletteWelcomeBubble::PaletteWelcomeBubble(PaletteTray* tray) : tray_(tray) {

ash/system/phonehub/camera_roll_view.cc

@@ -163,7 +163,7 @@ void CameraRollView::CameraRollItemsView::CalculateIdealBounds() {
   }
 }
 
-BEGIN_METADATA(CameraRollView, CameraRollItemsView, views::View)
+BEGIN_METADATA(CameraRollView, CameraRollItemsView)
 END_METADATA
 
 void CameraRollView::Update() {

ash/system/phonehub/phone_hub_recent_apps_view.cc

@@ -169,7 +169,7 @@ void PhoneHubRecentAppsView::HeaderView::SetErrorButtonVisible(
   }
 }
 
-BEGIN_METADATA(PhoneHubRecentAppsView, HeaderView, views::View)
+BEGIN_METADATA(PhoneHubRecentAppsView, HeaderView)
 END_METADATA
 
 class PhoneHubRecentAppsView::PlaceholderView : public views::Label {
@@ -197,7 +197,7 @@ class PhoneHubRecentAppsView::PlaceholderView : public views::Label {
   PlaceholderView operator=(PlaceholderView&) = delete;
 };
 
-BEGIN_METADATA(PhoneHubRecentAppsView, PlaceholderView, views::Label)
+BEGIN_METADATA(PhoneHubRecentAppsView, PlaceholderView)
 END_METADATA
 
 PhoneHubRecentAppsView::PhoneHubRecentAppsView(
@@ -302,7 +302,7 @@ PhoneHubRecentAppsView::RecentAppButtonsView::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
-BEGIN_METADATA(PhoneHubRecentAppsView, RecentAppButtonsView, views::View)
+BEGIN_METADATA(PhoneHubRecentAppsView, RecentAppButtonsView)
 END_METADATA
 
 PhoneHubRecentAppsView::LoadingView::LoadingView() {
@@ -363,7 +363,7 @@ void PhoneHubRecentAppsView::LoadingView::StopLoadingAnimation() {
   more_apps_button_->StopLoadingAnimation();
 }
 
-BEGIN_METADATA(PhoneHubRecentAppsView, LoadingView, views::BoxLayoutView)
+BEGIN_METADATA(PhoneHubRecentAppsView, LoadingView)
 END_METADATA
 
 void PhoneHubRecentAppsView::Update() {

ash/system/phonehub/task_continuation_view.cc

@@ -155,7 +155,7 @@ void TaskContinuationView::TaskChipsView::CalculateIdealBounds() {
   }
 }
 
-BEGIN_METADATA(TaskContinuationView, TaskChipsView, views::View)
+BEGIN_METADATA(TaskContinuationView, TaskChipsView)
 END_METADATA
 
 void TaskContinuationView::Update() {

ash/system/power/power_button_menu_screen_view.cc

@@ -117,9 +117,7 @@ class PowerButtonMenuScreenView::PowerButtonMenuBackgroundView
   base::RepeatingClosure show_animation_done_;
 };
 
-BEGIN_METADATA(PowerButtonMenuScreenView,
-               PowerButtonMenuBackgroundView,
-               views::View)
+BEGIN_METADATA(PowerButtonMenuScreenView, PowerButtonMenuBackgroundView)
 END_METADATA
 
 PowerButtonMenuScreenView::PowerButtonMenuScreenView(

ash/system/time/calendar_view.cc

@@ -376,7 +376,7 @@ class CalendarView::MonthHeaderLabelView : public views::View {
   const raw_ptr<views::Label> month_label_ = nullptr;
 };
 
-BEGIN_METADATA(CalendarView, MonthHeaderLabelView, views::View)
+BEGIN_METADATA(CalendarView, MonthHeaderLabelView)
 END_METADATA
 
 CalendarView::ScrollContentsView::ScrollContentsView(
@@ -441,7 +441,7 @@ void CalendarView::ScrollContentsView::StylusEventHandler::OnTouchEvent(
   }
 }
 
-BEGIN_METADATA(CalendarView, ScrollContentsView, views::View)
+BEGIN_METADATA(CalendarView, ScrollContentsView)
 END_METADATA
 
 CalendarHeaderView::CalendarHeaderView(const std::u16string& month,

ash/system/tray/status_area_overflow_button_tray.cc

@@ -99,7 +99,7 @@ void StatusAreaOverflowButtonTray::IconView::UpdateRotation() {
   SetTransform(transform);
 }
 
-BEGIN_METADATA(StatusAreaOverflowButtonTray, IconView, views::ImageView)
+BEGIN_METADATA(StatusAreaOverflowButtonTray, IconView)
 END_METADATA
 
 StatusAreaOverflowButtonTray::StatusAreaOverflowButtonTray(Shelf* shelf)

ash/system/unified/feature_tiles_container_view.cc

@@ -73,7 +73,7 @@ class FeatureTilesContainerView::RowContainer : public views::FlexLayoutView {
   const raw_ptr<FeatureTilesContainerView> container_;
 };
 
-BEGIN_METADATA(FeatureTilesContainerView, RowContainer, views::FlexLayoutView)
+BEGIN_METADATA(FeatureTilesContainerView, RowContainer)
 END_METADATA
 
 // The page container that holds `RowContainer` elements. Can hold from one up
@@ -95,7 +95,7 @@ class FeatureTilesContainerView::PageContainer : public views::FlexLayoutView {
   ~PageContainer() override = default;
 };
 
-BEGIN_METADATA(FeatureTilesContainerView, PageContainer, views::FlexLayoutView)
+BEGIN_METADATA(FeatureTilesContainerView, PageContainer)
 END_METADATA
 
 FeatureTilesContainerView::FeatureTilesContainerView(

ash/system/unified/quick_settings_header.cc

@@ -176,7 +176,7 @@ class QuickSettingsHeader::ManagedStateView : public views::Button {
   const raw_ref<const gfx::VectorIcon> icon_;
 };
 
-BEGIN_METADATA(QuickSettingsHeader, ManagedStateView, views::Button)
+BEGIN_METADATA(QuickSettingsHeader, ManagedStateView)
 END_METADATA
 
 class QuickSettingsHeader::EnterpriseManagedView
@@ -277,7 +277,7 @@ class QuickSettingsHeader::EnterpriseManagedView
   bool narrow_layout_ = false;
 };
 
-BEGIN_METADATA(QuickSettingsHeader, EnterpriseManagedView, ManagedStateView)
+BEGIN_METADATA(QuickSettingsHeader, EnterpriseManagedView)
 END_METADATA
 
 QuickSettingsHeader::QuickSettingsHeader(

ash/system/unified/quick_settings_view.cc

@@ -100,7 +100,7 @@ class QuickSettingsView::SystemTrayContainer : public views::View {
   const raw_ptr<views::BoxLayout> layout_manager_;
 };
 
-BEGIN_METADATA(QuickSettingsView, SystemTrayContainer, views::View)
+BEGIN_METADATA(QuickSettingsView, SystemTrayContainer)
 END_METADATA
 
 QuickSettingsView::QuickSettingsView(UnifiedSystemTrayController* controller)

ash/system/video_conference/bubble/return_to_app_panel.cc

@@ -425,7 +425,7 @@ gfx::Size ReturnToAppPanel::ReturnToAppContainer::CalculatePreferredSize()
   return size;
 }
 
-BEGIN_METADATA(ReturnToAppPanel, ReturnToAppContainer, views::View)
+BEGIN_METADATA(ReturnToAppPanel, ReturnToAppContainer)
 END_METADATA
 
 // -----------------------------------------------------------------------------

ash/wm/gestures/back_gesture/back_gesture_contextual_nudge.cc

@@ -379,12 +379,10 @@ class BackGestureContextualNudge::ContextualNudgeView
   base::OnceCallback<void(bool)> callback_;
 };
 
-BEGIN_METADATA(BackGestureContextualNudge, ContextualNudgeView, views::View)
+BEGIN_METADATA(BackGestureContextualNudge, ContextualNudgeView)
 END_METADATA
 
-BEGIN_METADATA(BackGestureContextualNudge::ContextualNudgeView,
-               SuggestionView,
-               views::View)
+BEGIN_METADATA(BackGestureContextualNudge::ContextualNudgeView, SuggestionView)
 END_METADATA
 
 BackGestureContextualNudge::BackGestureContextualNudge(

ash/wm/splitview/split_view_drag_indicators.cc

@@ -216,9 +216,7 @@ class SplitViewDragIndicators::RotatedImageLabelView
   raw_ptr<views::Label> label_ = nullptr;
 };
 
-BEGIN_METADATA(SplitViewDragIndicators,
-               RotatedImageLabelView,
-               views::BoxLayoutView)
+BEGIN_METADATA(SplitViewDragIndicators, RotatedImageLabelView)
 END_METADATA
 
 // View which contains two highlights on each side indicator where a user should
@@ -654,9 +652,7 @@ class SplitViewDragIndicators::SplitViewDragIndicatorsView
   raw_ptr<aura::Window> dragged_window_ = nullptr;
 };
 
-BEGIN_METADATA(SplitViewDragIndicators,
-               SplitViewDragIndicatorsView,
-               views::View)
+BEGIN_METADATA(SplitViewDragIndicators, SplitViewDragIndicatorsView)
 END_METADATA
 
 SplitViewDragIndicators::SplitViewDragIndicators(aura::Window* root_window) {

chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.cc

@@ -179,7 +179,7 @@ class EditFinishView::ChildButton : public views::LabelButton {
   OnMouseReleasedCallback on_mouse_released_callback_;
 };
 
-BEGIN_METADATA(EditFinishView, ChildButton, views::LabelButton)
+BEGIN_METADATA(EditFinishView, ChildButton)
 END_METADATA
 
 // static

chrome/browser/ash/arc/input_overlay/ui/editing_list.cc

@@ -203,7 +203,7 @@ class EditingList::AddContainerButton : public views::Button {
   base::CallbackListSubscription title_changed_callback_;
 };
 
-BEGIN_METADATA(EditingList, AddContainerButton, views::Button)
+BEGIN_METADATA(EditingList, AddContainerButton)
 END_METADATA
 
 // -----------------------------------------------------------------------------

chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc

@@ -160,7 +160,7 @@ class InputMenuView::FeedbackButton : public views::LabelButton {
   ~FeedbackButton() override = default;
 };
 
-BEGIN_METADATA(InputMenuView, FeedbackButton, views::LabelButton)
+BEGIN_METADATA(InputMenuView, FeedbackButton)
 END_METADATA
 
 // static

chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc

@@ -241,7 +241,7 @@ class SharesheetHeaderView::SharesheetImagePreview : public views::View {
   std::vector<raw_ptr<RoundedImageView, VectorExperimental>> image_views_;
 };
 
-BEGIN_METADATA(SharesheetHeaderView, SharesheetImagePreview, views::View)
+BEGIN_METADATA(SharesheetHeaderView, SharesheetImagePreview)
 END_METADATA
 
 // SharesheetHeaderView --------------------------------------------------------

chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc

@@ -379,7 +379,7 @@ class BookmarkBarView::ButtonSeparatorView : public views::Separator {
   int separator_thickness_;
 };
 
-BEGIN_METADATA(BookmarkBarView, ButtonSeparatorView, views::Separator)
+BEGIN_METADATA(BookmarkBarView, ButtonSeparatorView)
 END_METADATA
 
 // BookmarkBarView ------------------------------------------------------------

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

@@ -1874,7 +1874,7 @@ class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase {
   raw_ptr<TestViewForMenuExit, DanglingUntriaged> test_view_ = nullptr;
 };
 
-BEGIN_METADATA(BookmarkBarViewTest20, TestViewForMenuExit, views::View)
+BEGIN_METADATA(BookmarkBarViewTest20, TestViewForMenuExit)
 END_METADATA
 
 // TODO(https://crbug.com/1506808): Flaky on Windows.

chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.cc

@@ -182,7 +182,7 @@ class SavedTabGroupBar::OverflowMenu : public views::View {
   raw_ref<SavedTabGroupBar> parent_bar_;
 };
 
-BEGIN_METADATA(SavedTabGroupBar, OverflowMenu, views::View)
+BEGIN_METADATA(SavedTabGroupBar, OverflowMenu)
 END_METADATA
 
 SavedTabGroupBar::SavedTabGroupBar(Browser* browser,

chrome/browser/ui/views/borealis/borealis_installer_view.cc

@@ -129,7 +129,7 @@ class BorealisInstallerView::TitleLabel : public views::Label {
   }
 };
 
-BEGIN_METADATA(BorealisInstallerView, TitleLabel, views::Label)
+BEGIN_METADATA(BorealisInstallerView, TitleLabel)
 END_METADATA
 
 BorealisInstallerView::BorealisInstallerView(Profile* profile)

chrome/browser/ui/views/bruschetta/bruschetta_installer_view.cc

@@ -89,7 +89,7 @@ class BruschettaInstallerView::TitleLabel : public views::Label {
   }
 };
 
-BEGIN_METADATA(BruschettaInstallerView, TitleLabel, views::Label)
+BEGIN_METADATA(BruschettaInstallerView, TitleLabel)
 END_METADATA
 
 BruschettaInstallerView::BruschettaInstallerView(Profile* profile,

chrome/browser/ui/views/content_setting_bubble_contents.cc

@@ -263,7 +263,7 @@ void ContentSettingBubbleContents::ListItemContainer::UpdateScrollHeight(
   }
 }
 
-BEGIN_METADATA(ContentSettingBubbleContents, ListItemContainer, views::View)
+BEGIN_METADATA(ContentSettingBubbleContents, ListItemContainer)
 END_METADATA
 
 // ContentSettingBubbleContents -----------------------------------------------

chrome/browser/ui/views/desktop_capture/desktop_media_list_controller.cc

@@ -30,7 +30,7 @@ bool ShouldAutoAcceptThisTabCapture() {
 
 }  // namespace
 
-BEGIN_METADATA(DesktopMediaListController, ListView, views::View)
+BEGIN_METADATA(DesktopMediaListController, ListView)
 END_METADATA
 
 DesktopMediaListController::DesktopMediaListController(

chrome/browser/ui/views/download/download_item_view.cc

@@ -267,7 +267,7 @@ class DownloadItemView::ContextMenuButton : public views::ImageButton {
   bool suppress_button_release_ = false;
 };
 
-BEGIN_METADATA(DownloadItemView, ContextMenuButton, views::ImageButton)
+BEGIN_METADATA(DownloadItemView, ContextMenuButton)
 END_METADATA
 
 DownloadItemView::DownloadItemView(DownloadUIModel::DownloadUIModelPtr model,

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

@@ -52,7 +52,7 @@ bool ExpandableContainerView::DetailsView::GetExpanded() const {
   return expanded_;
 }
 
-BEGIN_METADATA(ExpandableContainerView, DetailsView, views::View)
+BEGIN_METADATA(ExpandableContainerView, DetailsView)
 ADD_PROPERTY_METADATA(bool, Expanded)
 END_METADATA
 

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

@@ -315,9 +315,7 @@ class ExtensionInstallDialogView::ExtensionJustificationView
   raw_ptr<views::Label> justification_text_length_;
 };
 
-BEGIN_METADATA(ExtensionInstallDialogView,
-               ExtensionJustificationView,
-               views::View)
+BEGIN_METADATA(ExtensionInstallDialogView, ExtensionJustificationView)
 END_METADATA
 
 ExtensionInstallDialogView::ExtensionInstallDialogView(
@@ -721,7 +719,7 @@ void ExtensionInstallDialogView::EnableInstallButton() {
   DialogModelChanged();
 }
 
-BEGIN_METADATA(ExtensionInstallDialogView, views::BubbleDialogDelegateView)
+BEGIN_METADATA(ExtensionInstallDialogView)
 END_METADATA
 
 // static

chrome/browser/ui/views/hats/hats_next_web_dialog.cc

@@ -128,7 +128,7 @@ class HatsNextWebDialog::HatsWebView : public views::WebView {
   raw_ptr<Browser> browser_;
 };
 
-BEGIN_METADATA(HatsNextWebDialog, HatsWebView, views::WebView)
+BEGIN_METADATA(HatsNextWebDialog, HatsWebView)
 END_METADATA
 
 HatsNextWebDialog::HatsNextWebDialog(

chrome/browser/ui/views/intent_picker_bubble_view.cc

@@ -810,5 +810,5 @@ void IntentPickerBubbleView::ClearIntentPickerBubbleView() {
 BEGIN_METADATA(IntentPickerBubbleView)
 END_METADATA
 
-BEGIN_METADATA(IntentPickerBubbleView, IntentPickerAppsView, views::ScrollView)
+BEGIN_METADATA(IntentPickerBubbleView, IntentPickerAppsView)
 END_METADATA

chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc

@@ -130,7 +130,7 @@ void IconLabelBubbleView::SeparatorView::UpdateOpacity() {
   layer()->SetOpacity(opacity);
 }
 
-BEGIN_METADATA(IconLabelBubbleView, SeparatorView, views::View)
+BEGIN_METADATA(IconLabelBubbleView, SeparatorView)
 END_METADATA
 
 class IconLabelBubbleView::HighlightPathGenerator

chrome/browser/ui/views/page_info/page_info_main_view.cc

@@ -84,7 +84,7 @@ void PageInfoMainView::ContainerView::Update() {
   PreferredSizeChanged();
 }
 
-BEGIN_METADATA(PageInfoMainView, ContainerView, views::View)
+BEGIN_METADATA(PageInfoMainView, ContainerView)
 END_METADATA
 
 PageInfoMainView::PageInfoMainView(

chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc

@@ -251,7 +251,7 @@ void MoveToAccountStoreBubbleView::MovingBannerView::UpdateFavicon(
   to_view->UpdateBadge(favicon);
 }
 
-BEGIN_METADATA(MoveToAccountStoreBubbleView, MovingBannerView, views::View)
+BEGIN_METADATA(MoveToAccountStoreBubbleView, MovingBannerView)
 END_METADATA
 
 MoveToAccountStoreBubbleView::MoveToAccountStoreBubbleView(

chrome/browser/ui/views/passwords/password_generation_popup_view_views.cc

@@ -515,9 +515,7 @@ void PasswordGenerationPopupViewViews::GeneratedPasswordBox::OnGestureEvent(
   }
 }
 
-BEGIN_METADATA(PasswordGenerationPopupViewViews,
-               GeneratedPasswordBox,
-               views::View)
+BEGIN_METADATA(PasswordGenerationPopupViewViews, GeneratedPasswordBox)
 END_METADATA
 
 PasswordGenerationPopupViewViews::PasswordGenerationPopupViewViews(

chrome/browser/ui/views/payments/payment_request_item_list.cc

@@ -167,7 +167,7 @@ void PaymentRequestItemList::Item::ButtonPressed() {
   }
 }
 
-BEGIN_METADATA(PaymentRequestItemList, Item, PaymentRequestRowView)
+BEGIN_METADATA(PaymentRequestItemList, Item)
 END_METADATA
 
 PaymentRequestItemList::PaymentRequestItemList(

chrome/browser/ui/views/side_panel/side_panel_toolbar_container.cc

@@ -112,9 +112,7 @@ SidePanelToolbarContainer::PinnedSidePanelToolbarButton::CreateMenuModel() {
       dialog_model.Build());
 }
 
-BEGIN_METADATA(SidePanelToolbarContainer,
-               PinnedSidePanelToolbarButton,
-               ToolbarButton)
+BEGIN_METADATA(SidePanelToolbarContainer, PinnedSidePanelToolbarButton)
 END_METADATA
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc

@@ -632,5 +632,5 @@ void TabGroupEditorBubbleView::TitleField::ShowContextMenu(
   views::Textfield::ShowContextMenu(p, source_type);
 }
 
-BEGIN_METADATA(TabGroupEditorBubbleView, TitleField, views::Textfield)
+BEGIN_METADATA(TabGroupEditorBubbleView, TitleField)
 END_METADATA

chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc

@@ -340,7 +340,7 @@ class TabHoverCardBubbleView::ThumbnailView
   ImageType image_type_ = ImageType::kNone;
 };
 
-BEGIN_METADATA(TabHoverCardBubbleView, ThumbnailView, views::View)
+BEGIN_METADATA(TabHoverCardBubbleView, ThumbnailView)
 END_METADATA
 
 // TabHoverCardBubbleView:

chrome/browser/ui/views/tabs/tab_strip.cc

@@ -949,7 +949,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext,
   base::WeakPtrFactory<TabDragContext> weak_factory_{this};
 };
 
-BEGIN_METADATA(TabStrip, TabDragContextImpl, views::View);
+BEGIN_METADATA(TabStrip, TabDragContextImpl);
 END_METADATA
 
 ///////////////////////////////////////////////////////////////////////////////

chrome/browser/ui/views/toolbar/app_menu.cc

@@ -625,7 +625,7 @@ class AppMenu::CutCopyPasteView : public AppMenuView {
   }
 };
 
-BEGIN_METADATA(AppMenu, CutCopyPasteView, AppMenuView)
+BEGIN_METADATA(AppMenu, CutCopyPasteView)
 ADD_READONLY_PROPERTY_METADATA(int, MaxChildViewPreferredWidth)
 END_METADATA
 
@@ -859,7 +859,7 @@ class AppMenu::ZoomView : public AppMenuView {
   mutable std::optional<int> zoom_label_max_width_;
 };
 
-BEGIN_METADATA(AppMenu, ZoomView, AppMenuView)
+BEGIN_METADATA(AppMenu, ZoomView)
 ADD_READONLY_PROPERTY_METADATA(int, ZoomLabelMaxWidth)
 END_METADATA
 

chrome/browser/ui/views/toolbar/toolbar_view.cc

@@ -215,7 +215,7 @@ class ToolbarView::ContainerView : public views::View {
   }
 };
 
-BEGIN_METADATA(ToolbarView, ContainerView, views::View)
+BEGIN_METADATA(ToolbarView, ContainerView)
 END_METADATA
 
 ////////////////////////////////////////////////////////////////////////////////

chromeos/ash/components/auth_panel/impl/views/password_auth_view.cc

@@ -88,7 +88,7 @@ class PasswordAuthView::LoginPasswordRow : public views::View {
   }
 };
 
-BEGIN_METADATA(PasswordAuthView, LoginPasswordRow, views::View)
+BEGIN_METADATA(PasswordAuthView, LoginPasswordRow)
 END_METADATA
 
 void PasswordAuthView::ConfigureRootLayout() {

chromeos/ui/frame/caption_buttons/frame_size_button.cc

@@ -190,7 +190,7 @@ class FrameSizeButton::PieAnimationView : public views::View,
   const raw_ptr<FrameSizeButton> button_;
 };
 
-BEGIN_METADATA(FrameSizeButton, PieAnimationView, views::View)
+BEGIN_METADATA(FrameSizeButton, PieAnimationView)
 END_METADATA
 
 // The class to observe the to-be-snapped window during the waiting-for-snap

chromeos/ui/frame/frame_header.cc

@@ -173,7 +173,7 @@ void FrameHeader::FrameAnimatorView::StopAnimation() {
   }
 }
 
-BEGIN_METADATA(FrameHeader, FrameAnimatorView, views::View)
+BEGIN_METADATA(FrameHeader, FrameAnimatorView)
 END_METADATA
 
 ///////////////////////////////////////////////////////////////////////////////

chromeos/ui/frame/header_view.cc

@@ -65,7 +65,7 @@ class HeaderView::HeaderContentView : public views::View {
       views::PaintInfo::ScaleType::kScaleWithEdgeSnapping;
 };
 
-BEGIN_METADATA(HeaderView, HeaderContentView, views::View)
+BEGIN_METADATA(HeaderView, HeaderContentView)
 END_METADATA
 
 HeaderView::HeaderView(views::Widget* target_widget,

chromeos/ui/frame/multitask_menu/split_button_view.cc

@@ -141,7 +141,7 @@ class SplitButtonView::SplitButton : public views::Button {
   base::RepeatingClosure hovered_pressed_callback_;
 };
 
-BEGIN_METADATA(SplitButtonView, SplitButton, views::Button)
+BEGIN_METADATA(SplitButtonView, SplitButton)
 END_METADATA
 
 // -----------------------------------------------------------------------------

chromeos/ui/frame/non_client_frame_view_base.cc

@@ -56,7 +56,7 @@ bool NonClientFrameViewBase::OverlayView::DoesIntersectRect(
   return header_view_->HitTestRect(rect);
 }
 
-BEGIN_METADATA(NonClientFrameViewBase, OverlayView, views::View)
+BEGIN_METADATA(NonClientFrameViewBase, OverlayView)
 END_METADATA
 
 NonClientFrameViewBase::NonClientFrameViewBase(views::Widget* frame)

components/fullscreen_control/subtle_notification_view.cc

@@ -179,7 +179,7 @@ void SubtleNotificationView::InstructionView::AddTextSegment(
   AddChildView(key);
 }
 
-BEGIN_METADATA(SubtleNotificationView, InstructionView, views::View)
+BEGIN_METADATA(SubtleNotificationView, InstructionView)
 ADD_PROPERTY_METADATA(std::u16string, Text)
 END_METADATA
 

components/global_media_controls/public/views/media_item_ui_view.cc

@@ -74,7 +74,7 @@ class MediaItemUIView::DismissButton : public views::ImageButton {
   ~DismissButton() override = default;
 };
 
-BEGIN_METADATA(MediaItemUIView, DismissButton, views::ImageButton)
+BEGIN_METADATA(MediaItemUIView, DismissButton)
 END_METADATA
 
 MediaItemUIView::MediaItemUIView(

docs/ui/views/metadata_properties.md

@@ -53,7 +53,7 @@ parameter to define the outer class or scope:
 
 
 ```
-BEGIN_METADATA(MyViewClass, MyNestedView, views::View)
+BEGIN_METADATA(MyViewClass, MyNestedView)
 END_METADATA
 ```
 

remoting/host/chromeos/message_box.cc

@@ -138,7 +138,7 @@ void MessageBox::Core::OnMessageBoxDestroyed() {
   result_callback_.Reset();
 }
 
-BEGIN_METADATA(MessageBox, Core, views::DialogDelegateView)
+BEGIN_METADATA(MessageBox, Core)
 END_METADATA
 
 MessageBox::MessageBox(const std::u16string& title_label,

ui/base/metadata/metadata_header_macros.h

@@ -27,12 +27,8 @@
                                                                       \
  private:  // NOLINTNEXTLINE
 
-#define _GET_MDH_MACRO_NAME(_1, _2, NAME, ...) NAME
-
-#define METADATA_HEADER(class_name, ...)                            \
-  _GET_MDH_MACRO_NAME(class_name, ##__VA_ARGS__, _METADATA_HEADER2, \
-                      _METADATA_HEADER1)                            \
-  (class_name, ##__VA_ARGS__)
+#define METADATA_HEADER(class_name, ancestor_class_name) \
+  _METADATA_HEADER2(class_name, ancestor_class_name)
 
 // When adding metadata to a templated class, use this macro. `class_name` is
 // the base name of the template class. If the `ancestor_class_name` is also a

ui/base/metadata/metadata_impl_macros.h

@@ -21,18 +21,11 @@
   BEGIN_METADATA_INTERNAL_BASE(                             \
       class_name, METADATA_CLASS_NAME_INTERNAL(class_name), class_name)
 
-#define _BEGIN_NESTED_METADATA(outer_class, class_name, parent_class_name) \
-  BEGIN_METADATA_INTERNAL(outer_class::class_name,                         \
-                          METADATA_CLASS_NAME_INTERNAL(class_name),        \
-                          parent_class_name)                               \
-  METADATA_PARENT_CLASS_INTERNAL(parent_class_name)
-
-#define _BEGIN_METADATA(class_name, parent_class_name)                         \
-  static_assert(!std::is_same_v<parent_class_name, class_name>,                \
-                "class and ancestor are the same");                            \
-  BEGIN_METADATA_INTERNAL(                                                     \
-      class_name, METADATA_CLASS_NAME_INTERNAL(class_name), parent_class_name) \
-  METADATA_PARENT_CLASS_INTERNAL(parent_class_name)
+#define _BEGIN_NESTED_METADATA(outer_class, class_name)             \
+  BEGIN_METADATA_INTERNAL(outer_class::class_name,                  \
+                          METADATA_CLASS_NAME_INTERNAL(class_name), \
+                          class_name::kAncestorClass)               \
+  METADATA_PARENT_CLASS_INTERNAL(class_name::kAncestorClass)
 
 #define _BEGIN_METADATA_SIMPLE(class_name)                          \
   BEGIN_METADATA_INTERNAL(class_name,                               \
@@ -40,7 +33,7 @@
                           class_name::kAncestorClass)               \
   METADATA_PARENT_CLASS_INTERNAL(class_name::kAncestorClass)
 
-#define _GET_MD_MACRO_NAME(_1, _2, _3, NAME, ...) NAME
+#define _GET_MD_MACRO_NAME(_1, _2, NAME, ...) NAME
 
 // The following macro overloads the above macros. For most cases, only two
 // parameters are used. In some instances when a class is nested within another
@@ -49,7 +42,7 @@
 
 #define BEGIN_METADATA(class_name, ...)                                 \
   _GET_MD_MACRO_NAME(class_name, ##__VA_ARGS__, _BEGIN_NESTED_METADATA, \
-                     _BEGIN_METADATA, _BEGIN_METADATA_SIMPLE)           \
+                     _BEGIN_METADATA_SIMPLE)                            \
   (class_name, ##__VA_ARGS__)
 
 // This macro is used for defining template specializations for a templated view

ui/views/controls/button/toggle_button.cc

@@ -603,7 +603,7 @@ void ToggleButton::AnimationProgressed(const gfx::Animation* animation) {
   Button::AnimationProgressed(animation);
 }
 
-BEGIN_METADATA(ToggleButton, ThumbView, View)
+BEGIN_METADATA(ToggleButton, ThumbView)
 END_METADATA
 
 BEGIN_METADATA(ToggleButton)

ui/views/controls/menu/menu_scroll_view_container.cc

@@ -214,7 +214,7 @@ class MenuScrollViewContainer::MenuScrollView : public View {
   raw_ptr<MenuScrollViewContainer> owner_;
 };
 
-BEGIN_METADATA(MenuScrollViewContainer, MenuScrollView, View)
+BEGIN_METADATA(MenuScrollViewContainer, MenuScrollView)
 END_METADATA
 
 // MenuScrollViewContainer ----------------------------------------------------

ui/views/controls/scroll_view.cc

@@ -274,7 +274,7 @@ class ScrollView::Viewport : public View {
   raw_ptr<ScrollView> scroll_view_;
 };
 
-BEGIN_METADATA(ScrollView, Viewport, View)
+BEGIN_METADATA(ScrollView, Viewport)
 ADD_READONLY_PROPERTY_METADATA(bool, IsContentsViewport)
 END_METADATA
 

ui/views/controls/scrollbar/overlay_scroll_bar.cc

@@ -133,7 +133,7 @@ void OverlayScrollBar::Thumb::OnStateChanged() {
   SchedulePaint();
 }
 
-BEGIN_METADATA(OverlayScrollBar, Thumb, BaseScrollBarThumb)
+BEGIN_METADATA(OverlayScrollBar, Thumb)
 END_METADATA
 
 OverlayScrollBar::OverlayScrollBar(Orientation orientation)

ui/views/examples/designer_example.cc

@@ -437,7 +437,7 @@ bool DesignerExample::GrabHandle::IsRight(GrabHandlePosition position) {
   return (position & GrabHandlePosition::kRight);
 }
 
-BEGIN_METADATA(DesignerExample, GrabHandle, View)
+BEGIN_METADATA(DesignerExample, GrabHandle)
 END_METADATA
 
 DesignerExample::GrabHandles::GrabHandles() = default;

ui/views/examples/layout_example_base.cc

@@ -179,7 +179,7 @@ Textfield* LayoutExampleBase::ChildPanel::CreateTextfield(
   return AddChildView(CreateCommonTextfieldWithAXName(this, name));
 }
 
-BEGIN_METADATA(LayoutExampleBase, ChildPanel, View)
+BEGIN_METADATA(LayoutExampleBase, ChildPanel)
 END_METADATA
 
 LayoutExampleBase::LayoutExampleBase(const char* title) : ExampleBase(title) {}

ui/views/examples/multiline_example.cc

@@ -161,7 +161,7 @@ class MultilineExample::RenderTextView : public View {
   std::unique_ptr<gfx::RenderText> render_text_;
 };
 
-BEGIN_METADATA(MultilineExample, RenderTextView, View)
+BEGIN_METADATA(MultilineExample, RenderTextView)
 END_METADATA
 
 MultilineExample::MultilineExample()

ui/views/examples/text_example.cc

@@ -116,7 +116,7 @@ class TextExample::TextExampleView : public View {
   gfx::ElideBehavior elide_ = gfx::NO_ELIDE;
 };
 
-BEGIN_METADATA(TextExample, TextExampleView, View)
+BEGIN_METADATA(TextExample, TextExampleView)
 END_METADATA
 
 TextExample::TextExample()

ui/views/touchui/touch_selection_controller_impl.cc

@@ -446,7 +446,7 @@ class TouchSelectionControllerImpl::EditingHandleView : public View {
   bool is_dragging_ = false;
 };
 
-BEGIN_METADATA(TouchSelectionControllerImpl, EditingHandleView, View)
+BEGIN_METADATA(TouchSelectionControllerImpl, EditingHandleView)
 ADD_READONLY_PROPERTY_METADATA(gfx::SelectionBound::Type, SelectionBoundType)
 ADD_READONLY_PROPERTY_METADATA(bool, IsDragging)
 ADD_READONLY_PROPERTY_METADATA(gfx::Size, HandleImageSize)

ui/views/window/dialog_client_view.cc

@@ -95,7 +95,7 @@ class DialogClientView::ButtonRowContainer : public View {
   const raw_ptr<DialogClientView> owner_;
 };
 
-BEGIN_METADATA(DialogClientView, ButtonRowContainer, View)
+BEGIN_METADATA(DialogClientView, ButtonRowContainer)
 END_METADATA
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)