Reland: Update image and text color when row is selected in the chooser on Mac

chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller_unittest.mm

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chooser_controller/mock_chooser_controller.h"
 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/extensions/chooser_dialog_cocoa.h"
 #include "chrome/browser/ui/cocoa/spinner_view.h"
 #include "chrome/grit/generated_resources.h"
+#include "skia/ext/skia_utils_mac.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // The lookup table for signal strength level image.
-const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
-                                             IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
-                                             IDR_SIGNAL_4_BAR};
+const int kSignalStrengthLevelBlackImageIds[5] = {
+    IDR_SIGNAL_0_BAR_BLACK, IDR_SIGNAL_1_BAR_BLACK, IDR_SIGNAL_2_BAR_BLACK,
+    IDR_SIGNAL_3_BAR_BLACK, IDR_SIGNAL_4_BAR_BLACK};
+const int kSignalStrengthLevelWhiteImageIds[5] = {
+    IDR_SIGNAL_0_BAR_WHITE, IDR_SIGNAL_1_BAR_WHITE, IDR_SIGNAL_2_BAR_WHITE,
+    IDR_SIGNAL_3_BAR_WHITE, IDR_SIGNAL_4_BAR_WHITE};
 
 }  // namespace
 
 class ChooserDialogCocoaControllerTest : public CocoaProfileTest {
  protected:
   ChooserDialogCocoaControllerTest()
       : rb_(ui::ResourceBundle::GetSharedInstance()) {}
   ~ChooserDialogCocoaControllerTest() override {}
 
   void SetUp() override {
@@ skipping 34 matching lines @@
     help_button_ = [chooser_content_view_ helpButton];
     ASSERT_TRUE(help_button_);
   }
 
   void ExpectNoRowImage(int row) {
     ASSERT_FALSE(
         [chooser_content_view_ tableRowViewImage:static_cast<NSInteger>(row)]);
   }
 
   void ExpectSignalStrengthLevelImageIs(int row,
-                                        int expected_signal_strength_level) {
+                                        int expected_signal_strength_level,
+                                        int expected_color) {
     NSImageView* image_view =
         [chooser_content_view_ tableRowViewImage:static_cast<NSInteger>(row)];
     ASSERT_TRUE(image_view);
-    EXPECT_NSEQ(
-        rb_.GetNativeImageNamed(
-               kSignalStrengthLevelImageIds[expected_signal_strength_level])
-            .ToNSImage(),
-        [image_view image]);
+    int image_id =
+        expected_color == MockChooserController::kImageColorBlack
+            ? kSignalStrengthLevelBlackImageIds[expected_signal_strength_level]
+            : kSignalStrengthLevelWhiteImageIds[expected_signal_strength_level];
+    EXPECT_NSEQ(rb_.GetNativeImageNamed(image_id).ToNSImage(),
+                [image_view image]);
   }
 
-  void ExpectRowImageIsConnectedImage(int row) {
+  void ExpectRowImageIsConnectedImage(int row, SkColor expected_color) {
     NSImageView* image_view =
         [chooser_content_view_ tableRowViewImage:static_cast<NSInteger>(row)];
     ASSERT_TRUE(image_view);
     EXPECT_TRUE(gfx::test::AreImagesEqual(
         gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BLUETOOTH_CONNECTED,
-                                         gfx::kChromeIconGrey)),
+                                         expected_color)),
         gfx::Image([[image_view image] copy])));
   }
 
   void ExpectRowTextIs(int row, NSString* expected_text) {
     EXPECT_NSEQ(expected_text,
                 [[chooser_content_view_
                     tableRowViewText:static_cast<NSInteger>(row)] stringValue]);
   }
 
+  void ExpectRowTextColorIs(int row, NSColor* expected_color) {
+    EXPECT_NSEQ(expected_color,
+                [[chooser_content_view_
+                    tableRowViewText:static_cast<NSInteger>(row)] textColor]);
+  }
+
   bool IsRowPaired(int row) {
     NSTextField* paired_status = [chooser_content_view_
         tableRowViewPairedStatus:static_cast<NSInteger>(row)];
     if (paired_status) {
       EXPECT_NSEQ(l10n_util::GetNSString(IDS_DEVICE_CHOOSER_PAIRED_STATUS_TEXT),
                   [paired_status stringValue]);
       return true;
     } else {
       return false;
     }
   }
 
+  void ExpectPairedTextColorIs(int row, NSColor* expected_color) {
+    EXPECT_NSEQ(
+        expected_color,
+        [[chooser_content_view_
+            tableRowViewPairedStatus:static_cast<NSInteger>(row)] textColor]);
+  }
+
   ui::ResourceBundle& rb_;
 
   std::unique_ptr<ChooserDialogCocoa> chooser_dialog_;
 
   MockChooserController* mock_chooser_controller_;
   ChooserDialogCocoaController* chooser_dialog_controller_;
   ChooserContentViewCocoa* chooser_content_view_;
   NSTableView* table_view_;
   SpinnerView* spinner_;
   NSTextField* status_;
@@ skipping 34 matching lines @@
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
   EXPECT_EQ(1, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   // |table_view_| should be enabled since there is an option.
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
-  ExpectRowImageIsConnectedImage(0);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
   ExpectRowTextIs(0, @"a");
   EXPECT_TRUE(IsRowPaired(0));
   EXPECT_FALSE(connect_button_.enabled);
   EXPECT_TRUE(cancel_button_.enabled);
   EXPECT_TRUE(help_button_.enabled);
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(2, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
   ExpectSignalStrengthLevelImageIs(
-      1, MockChooserController::kSignalStrengthLevel0Bar);
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(1, @"b");
   EXPECT_FALSE(IsRowPaired(1));
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_EQ(3, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
   ExpectSignalStrengthLevelImageIs(
-      2, MockChooserController::kSignalStrengthLevel1Bar);
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(2, @"c");
   EXPECT_FALSE(IsRowPaired(2));
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   ExpectSignalStrengthLevelImageIs(
-      3, MockChooserController::kSignalStrengthLevel2Bar);
+      3, MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(3, @"d");
   EXPECT_FALSE(IsRowPaired(3));
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("e"), MockChooserController::kSignalStrengthLevel3Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   ExpectSignalStrengthLevelImageIs(
-      4, MockChooserController::kSignalStrengthLevel3Bar);
+      4, MockChooserController::kSignalStrengthLevel3Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(4, @"e");
   EXPECT_FALSE(IsRowPaired(4));
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("f"), MockChooserController::kSignalStrengthLevel4Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   ExpectSignalStrengthLevelImageIs(
-      5, MockChooserController::kSignalStrengthLevel4Bar);
+      5, MockChooserController::kSignalStrengthLevel4Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(5, @"f");
   EXPECT_FALSE(IsRowPaired(5));
 }
 
 TEST_F(ChooserDialogCocoaControllerTest, RemoveOption) {
   CreateChooserDialog();
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
 
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("b"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
-  ExpectRowImageIsConnectedImage(0);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
   ExpectRowTextIs(0, @"a");
   EXPECT_TRUE(IsRowPaired(0));
   ExpectSignalStrengthLevelImageIs(
-      1, MockChooserController::kSignalStrengthLevel1Bar);
+      1, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(1, @"c");
   EXPECT_FALSE(IsRowPaired(1));
 
   // Remove a non-existent option, the number of rows should not change.
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("non-existent"));
   EXPECT_EQ(2, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
   ExpectRowTextIs(0, @"a");
@@ skipping 38 matching lines @@
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
 
   EXPECT_EQ(3, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
-  ExpectRowImageIsConnectedImage(0);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
   ExpectRowTextIs(0, @"a");
   EXPECT_TRUE(IsRowPaired(0));
-  ExpectRowImageIsConnectedImage(1);
+  ExpectRowImageIsConnectedImage(1, gfx::kChromeIconGrey);
   ExpectRowTextIs(1, @"d");
   EXPECT_TRUE(IsRowPaired(1));
   ExpectSignalStrengthLevelImageIs(
-      2, MockChooserController::kSignalStrengthLevel1Bar);
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(2, @"c");
   EXPECT_FALSE(IsRowPaired(2));
 }
 
 TEST_F(ChooserDialogCocoaControllerTest, AddAndRemoveOption) {
   CreateChooserDialog();
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
@@ skipping 40 matching lines @@
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
 
   mock_chooser_controller_->OptionRemoved(base::ASCIIToUTF16("d"));
 
   EXPECT_EQ(2, table_view_.numberOfRows);
   EXPECT_EQ(1, table_view_.numberOfColumns);
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(-1, table_view_.selectedRow);
-  ExpectRowImageIsConnectedImage(0);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
   ExpectRowTextIs(0, @"a");
   EXPECT_TRUE(IsRowPaired(0));
   ExpectSignalStrengthLevelImageIs(
-      1, MockChooserController::kSignalStrengthLevel1Bar);
+      1, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(1, @"c");
   EXPECT_FALSE(IsRowPaired(1));
 }
 
+TEST_F(ChooserDialogCocoaControllerTest,
+       RowImageAndTextChangeColorWhenSelectionChanges) {
+  CreateChooserDialog();
+
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("a"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  mock_chooser_controller_->OptionAdded(
+      base::ASCIIToUTF16("c"), MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Select option 0.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
+           byExtendingSelection:NO];
+  EXPECT_EQ(0, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, SK_ColorWHITE);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor whiteColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen300));
+
+  // Deselect option 0.
+  [table_view_ deselectRow:0];
+  EXPECT_EQ(-1, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Select option 1.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
+           byExtendingSelection:NO];
+  EXPECT_EQ(1, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorWhite);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor whiteColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Deselect option 1.
+  [table_view_ deselectRow:1];
+  EXPECT_EQ(-1, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Select option 0.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
+           byExtendingSelection:NO];
+  EXPECT_EQ(0, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, SK_ColorWHITE);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor whiteColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen300));
+
+  // Select option 1.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:1]
+           byExtendingSelection:NO];
+  EXPECT_EQ(1, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorWhite);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor whiteColor]);
+  ExpectRowTextColorIs(2, [NSColor blackColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Select option 2.
+  [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:2]
+           byExtendingSelection:NO];
+  EXPECT_EQ(2, table_view_.selectedRow);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
+  ExpectSignalStrengthLevelImageIs(
+      1, MockChooserController::kSignalStrengthLevel0Bar,
+      MockChooserController::kImageColorBlack);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorWhite);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor whiteColor]);
+  ExpectPairedTextColorIs(
+      0, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700));
+
+  // Update option 2.
+  mock_chooser_controller_->OptionUpdated(
+      base::ASCIIToUTF16("c"), base::ASCIIToUTF16("e"),
+      MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::ConnectedPairedStatus::NONE);
+  ExpectSignalStrengthLevelImageIs(
+      2, MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::kImageColorWhite);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor whiteColor]);
+
+  // Update option 2 again.
+  mock_chooser_controller_->OptionUpdated(
+      base::ASCIIToUTF16("e"), base::ASCIIToUTF16("f"),
+      MockChooserController::kNoSignalStrengthLevelImage,
+      MockChooserController::ConnectedPairedStatus::CONNECTED |
+          MockChooserController::ConnectedPairedStatus::PAIRED);
+  ExpectRowImageIsConnectedImage(2, SK_ColorWHITE);
+  ExpectRowTextColorIs(0, [NSColor blackColor]);
+  ExpectRowTextColorIs(1, [NSColor blackColor]);
+  ExpectRowTextColorIs(2, [NSColor whiteColor]);
+  ExpectPairedTextColorIs(
+      2, skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen300));
+}
+
 TEST_F(ChooserDialogCocoaControllerTest, SelectAndDeselectAnOption) {
   CreateChooserDialog();
 
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("a"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("b"), MockChooserController::kSignalStrengthLevel0Bar,
@@ skipping 149 matching lines @@
            byExtendingSelection:NO];
 
   // Update option 1.
   mock_chooser_controller_->OptionUpdated(
       base::ASCIIToUTF16("b"), base::ASCIIToUTF16("d"),
       MockChooserController::kNoSignalStrengthLevelImage,
       MockChooserController::ConnectedPairedStatus::CONNECTED |
           MockChooserController::ConnectedPairedStatus::PAIRED);
 
   EXPECT_EQ(1, table_view_.selectedRow);
-  ExpectRowImageIsConnectedImage(0);
+  ExpectRowImageIsConnectedImage(0, gfx::kChromeIconGrey);
   ExpectRowTextIs(0, @"a");
   EXPECT_TRUE(IsRowPaired(0));
-  ExpectRowImageIsConnectedImage(1);
+  ExpectRowImageIsConnectedImage(1, SK_ColorWHITE);
   ExpectRowTextIs(1, @"d");
   EXPECT_TRUE(IsRowPaired(1));
   ExpectSignalStrengthLevelImageIs(
-      2, MockChooserController::kSignalStrengthLevel1Bar);
+      2, MockChooserController::kSignalStrengthLevel1Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(2, @"c");
   EXPECT_FALSE(IsRowPaired(2));
   EXPECT_TRUE(connect_button_.enabled);
 }
 
 TEST_F(ChooserDialogCocoaControllerTest,
        AddAnOptionAndSelectItAndRemoveTheSelectedOption) {
   CreateChooserDialog();
 
   mock_chooser_controller_->OptionAdded(
@@ skipping 260 matching lines @@
   mock_chooser_controller_->OptionAdded(
       base::ASCIIToUTF16("d"), MockChooserController::kSignalStrengthLevel2Bar,
       MockChooserController::ConnectedPairedStatus::NONE);
   EXPECT_FALSE(table_view_.hidden);
   // |table_view_| should be enabled since there is an option.
   EXPECT_TRUE(table_view_.enabled);
   EXPECT_EQ(1, table_view_.numberOfRows);
   // No option selected.
   EXPECT_EQ(-1, table_view_.selectedRow);
   ExpectSignalStrengthLevelImageIs(
-      0, MockChooserController::kSignalStrengthLevel2Bar);
+      0, MockChooserController::kSignalStrengthLevel2Bar,
+      MockChooserController::kImageColorBlack);
   ExpectRowTextIs(0, @"d");
   EXPECT_FALSE(IsRowPaired(0));
   EXPECT_TRUE(spinner_.hidden);
   EXPECT_FALSE(status_.hidden);
   EXPECT_TRUE(rescan_button_.hidden);
   // OK button is disabled since no option is selected.
   EXPECT_FALSE(connect_button_.enabled);
   EXPECT_TRUE(cancel_button_.enabled);
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
@@ skipping 39 matching lines @@
       MockChooserController::ConnectedPairedStatus::NONE);
 
   // Select option 0 and press "Get help" button.
   [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:0]
            byExtendingSelection:NO];
   EXPECT_CALL(*mock_chooser_controller_, Select(testing::_)).Times(0);
   EXPECT_CALL(*mock_chooser_controller_, Cancel()).Times(0);
   EXPECT_CALL(*mock_chooser_controller_, OpenHelpCenterUrl()).Times(1);
   [help_button_ performClick:chooser_dialog_controller_];
 }