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

chrome/browser/ui/toolbar/media_router_action_unittest.cc

 // Copyright 2015 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.
 
 #include "base/macros.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
@@ skipping 105 matching lines @@
         CreateToolbarModelForProfileWithoutWaitingForReady(profile());
 
     // browser() will only be valid once BrowserWithTestWindowTest::SetUp()
     // has run.
     browser_action_test_util_.reset(
         new BrowserActionTestUtil(browser(), false));
     action_.reset(
         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 {
     browser_action_test_util_.reset();
     action_.reset();
     MediaRouterTest::TearDown();
   }
 
   TestMediaRouterAction* action() { return action_.get(); }
   const media_router::Issue* fake_issue_notification() {
     return &fake_issue_notification_;
   }
   const media_router::Issue* fake_issue_warning() {
     return &fake_issue_warning_;
   }
   const media_router::Issue* fake_issue_fatal() {
     return &fake_issue_fatal_;
   }
   const gfx::Image active_icon() { return active_icon_; }
   const gfx::Image error_icon() { return error_icon_; }
   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.
   scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
 
   scoped_ptr<TestMediaRouterAction> action_;
 
   // The associated ToolbarActionsModel (owned by the keyed service setup).
   ToolbarActionsModel* toolbar_model_;
 
@@ skipping 52 matching lines @@
 }
 
 // Tests the MediaRouterAction state updates based on whether there are local
 // routes.
 TEST_F(MediaRouterActionUnitTest, UpdateRoutes) {
   // Initially, there are no routes.
   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())));
 
   // 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())));
 }
 
 // Tests the MediaRouterAction icon based on updates to both issues and routes.
 TEST_F(MediaRouterActionUnitTest, UpdateIssuesAndRoutes) {
   // Initially, there are no issues or routes.
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // There is no change in |current_icon_| since notification issues do not
   // update the state.
   action()->OnIssueUpdated(fake_issue_notification());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 
   // Update |current_icon_|, with a priority to reflect the warning issue
   // rather than the local route.
   action()->OnIssueUpdated(fake_issue_warning());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 
   // Update |current_icon_| since the issue has been updated to fatal.
   action()->OnIssueUpdated(fake_issue_fatal());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 
   // When the fatal issue is dismissed, |current_icon_| reflects the existing
   // local route.
   action()->OnIssueUpdated(nullptr);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       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())));
 }
 
 TEST_F(MediaRouterActionUnitTest, IconPressedState) {
   // Start with one window with one tab.
   EXPECT_EQ(0, browser()->tab_strip_model()->count());
   chrome::NewTab(browser());
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
 
@@ skipping 23 matching lines @@
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller_->HideMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
   dialog_controller_->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
   dialog_controller_->HideMediaRouterDialog();
 }