[Media Router] Fix regression with icon not turning blue after casting.

chrome/browser/ui/toolbar/media_router_action_unittest.cc

Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
index 8625371b6072f936a94625a0c0b8bd8a3a6e296b..5920579138ce32cc5e79776a89371bfed6c2be5b 100644
--- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
@@ -123,6 +123,13 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
         new TestMediaRouterAction(
             browser(),
             browser_action_test_util_->GetToolbarActionsBar()));
+
+    local_display_route_list_.push_back(media_router::MediaRoute(
+        "routeId1", fake_source1_, "sinkId1", "description", true, "", true));

[Peter Kasting, 2016/01/30 00:52:19]

Nit: "" -> std::string()

[imcheng, 2016/02/01 18:48:07]

Done.

+    non_local_display_route_list_.push_back(media_router::MediaRoute(
+        "routeId2", fake_source1_, "sinkId2", "description", false, "", true));
+    non_local_display_route_list_.push_back(media_router::MediaRoute(
+        "routeId3", fake_source2_, "sinkId3", "description", true, "", false));
   }
 
   void TearDown() override {
@@ -146,6 +153,11 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
   const gfx::Image idle_icon() { return idle_icon_; }
   const gfx::Image warning_icon() { return warning_icon_; }
 
+ protected:
+  std::vector<media_router::MediaRoute> local_display_route_list_;
+  std::vector<media_router::MediaRoute> non_local_display_route_list_;
+  std::vector<media_router::MediaRoute::Id> empty_route_id_list_;

[Peter Kasting, 2016/01/30 00:52:19]

Nit: The Google style guide discourages protected data members (they are banned
outside of tests, and the test exception is "for technical reasons", implying
that these should be avoided if possible).

Prefer to expose const getters for these.

[imcheng, 2016/02/01 18:48:07]

Done.

+
  private:
   // A BrowserActionTestUtil object constructed with the associated
   // ToolbarActionsBar.
@@ -218,12 +230,18 @@ TEST_F(MediaRouterActionUnitTest, UpdateRoutes) {
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since there is a local route.
-  action()->OnHasLocalDisplayRouteUpdated(true);
+  action()->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since there are no local routes.
-  action()->OnHasLocalDisplayRouteUpdated(false);
+  action()->OnRoutesUpdated(non_local_display_route_list_,
+                            empty_route_id_list_);
+  EXPECT_TRUE(gfx::test::AreImagesEqual(
+      idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
+
+  action()->OnRoutesUpdated(std::vector<media_router::MediaRoute>(),
+                            empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 }
@@ -241,12 +259,13 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Non-local routes also do not have an effect on |current_icon_|.
-  action()->OnHasLocalDisplayRouteUpdated(false);
+  action()->OnRoutesUpdated(non_local_display_route_list_,
+                            empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since there is a local route.
-  action()->OnHasLocalDisplayRouteUpdated(true);
+  action()->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -257,7 +276,8 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
       warning_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Closing a local route makes no difference to |current_icon_|.
-  action()->OnHasLocalDisplayRouteUpdated(false);
+  action()->OnRoutesUpdated(non_local_display_route_list_,
+                            empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       warning_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -267,7 +287,7 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Fatal issues still take precedent over local routes.
-  action()->OnHasLocalDisplayRouteUpdated(true);
+  action()->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
@@ -278,7 +298,8 @@ TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| when the local route is closed.
-  action()->OnHasLocalDisplayRouteUpdated(false);
+  action()->OnRoutesUpdated(non_local_display_route_list_,
+                            empty_route_id_list_);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 }