Fixed color access in FileSystemUsageBubble and CastDialogSinkButton.

Removed GetInstanceForNativeUi() from NativeFileSystemUsageBubbleView
and CastDialogSinkButton.

Changed the FileSystemUsageBubble to update its icons on theme change
to keep sync with the current theme color values.

Bug: 1056916
Change-Id: I81254025570f009cfea5db26ee982cf14ad45580
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2089986Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Lukaszewicz <tluk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747709}

chrome/browser/ui/views/media_router/cast_dialog_sink_button.cc

@@ -47,9 +47,8 @@ class SinkIssueIconView : public views::ImageView {
 
   // views::ImageView:
   void OnThemeChanged() override {
-    const SkColor icon_color =
-        ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
-            ui::NativeTheme::kColorId_DefaultIconColor);
+    const SkColor icon_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_DefaultIconColor);
     SetImage(gfx::CreateVectorIcon(::vector_icons::kInfoOutlineIcon,
                                    kPrimaryIconSize, icon_color));
   }

chrome/browser/ui/views/native_file_system/native_file_system_usage_bubble_view.cc

@@ -100,9 +100,6 @@ class CollapsibleListView : public views::View, public views::ButtonListener {
   static constexpr int kExpandedTableRowCount = 3;
 
   explicit CollapsibleListView(ui::TableModel* model) {
-    const SkColor icon_color =
-        ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
-            ui::NativeTheme::kColorId_DefaultIconColor);
     const views::LayoutProvider* provider = ChromeLayoutProvider::Get();
 
     SetLayoutManager(std::make_unique<views::BoxLayout>(
@@ -138,12 +135,8 @@ class CollapsibleListView : public views::View, public views::ButtonListener {
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label_layout->SetFlexForView(label, 1);
     auto button = views::CreateVectorToggleImageButton(this);
-    views::SetImageFromVectorIconWithColor(
-        button.get(), kCaretDownIcon, ui::TableModel::kIconSize, icon_color);
     button->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_EXPAND));
-    views::SetToggledImageFromVectorIconWithColor(
-        button.get(), kCaretUpIcon, ui::TableModel::kIconSize, icon_color);
     button->SetToggledTooltipText(
         l10n_util::GetStringUTF16(IDS_NATIVE_FILE_SYSTEM_USAGE_COLLAPSE));
     expand_collapse_button_ = label_container->AddChildView(std::move(button));
@@ -173,6 +166,18 @@ class CollapsibleListView : public views::View, public views::ButtonListener {
     table_view_parent_->SetVisible(false);
   }
 
+  // views::View
+  void OnThemeChanged() override {
+    const SkColor icon_color = GetNativeTheme()->GetSystemColor(
+        ui::NativeTheme::kColorId_DefaultIconColor);
+    views::SetImageFromVectorIconWithColor(
+        expand_collapse_button_, kCaretDownIcon, ui::TableModel::kIconSize,
+        icon_color);
+    views::SetToggledImageFromVectorIconWithColor(
+        expand_collapse_button_, kCaretUpIcon, ui::TableModel::kIconSize,
+        icon_color);
+  }
+
   // views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override {
     table_is_expanded_ = !table_is_expanded_;