MediaRouterAction: Only observe Media Routes when there is a local route.

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 "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"
 #include "chrome/browser/ui/webui/media_router/media_router_test.h"
@@ skipping 78 matching lines @@
             "title fatal",
             "message fatal",
             media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
             std::vector<media_router::IssueAction>(),
             "route_id",
             media_router::Issue::FATAL,
             true,
             std::string())),
         fake_source1_("fakeSource1"),
         fake_source2_("fakeSource2"),
-        fake_route_local_("route1",
-                          fake_source1_,
-                          "fakeSink1",
-                          "desc1",
-                          true,
-                          "path.html",
-                          false),
-        fake_route_remote_("route2",
-                           fake_source2_,
-                           "fakeSink2",
-                           "desc2",
-                           false,
-                           "path.html",
-                           true),
         active_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_MEDIA_ROUTER_ACTIVE_ICON)),
         error_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_MEDIA_ROUTER_ERROR_ICON)),
         idle_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_MEDIA_ROUTER_IDLE_ICON)),
         warning_icon_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
             IDR_MEDIA_ROUTER_WARNING_ICON)) {}
 
   ~MediaRouterActionUnitTest() override {}
@@ skipping 12 matching lines @@
   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 media_router::MediaRoute fake_route_local() {
-    return fake_route_local_;
-  }
-  const media_router::MediaRoute fake_route_remote() {
-    return fake_route_remote_;
-  }
   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_; }
 
  private:
   scoped_ptr<TestMediaRouterAction> action_;
 
   // Fake Issues.
   const media_router::Issue fake_issue_notification_;
   const media_router::Issue fake_issue_warning_;
   const media_router::Issue fake_issue_fatal_;
 
   // Fake Sources, used for the Routes.
   const media_router::MediaSource fake_source1_;
   const media_router::MediaSource fake_source2_;
 
-  // Fake Routes.
-  const media_router::MediaRoute fake_route_local_;
-  const media_router::MediaRoute fake_route_remote_;
-
   // Cached images.
   const gfx::Image active_icon_;
   const gfx::Image error_icon_;
   const gfx::Image idle_icon_;
   const gfx::Image warning_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterActionUnitTest);
 };
 
 // Tests the initial state of MediaRouterAction after construction.
@@ skipping 25 matching lines @@
   action()->OnIssueUpdated(fake_issue_fatal());
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       error_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Clear the issue.
   action()->OnIssueUpdated(nullptr);
   EXPECT_TRUE(gfx::test::AreImagesEqual(idle_icon(),
                                  action()->GetIcon(nullptr, gfx::Size())));
 }
 
-// Tests the MediaRouterAction state based on updates to routes.
+// Tests the MediaRouterAction state based on updates on whether there are
+// local routes.

[Peter Kasting, 2015/10/02 19:04:01]

Nit: Grammar; should this be "state updates based on whether"?

[apacible, 2015/10/02 20:45:48]

Done.

 TEST_F(MediaRouterActionUnitTest, UpdateRoutes) {
-  scoped_ptr<std::vector<media_router::MediaRoute>> routes(
-      new std::vector<media_router::MediaRoute>());
-
   // 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.
-  routes->push_back(fake_route_local());
-  routes->push_back(fake_route_remote());
-  action()->OnRoutesUpdated(*routes.get());
+  action()->OnHasLocalRouteUpdated(true);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       active_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
-  // Update |current_icon_| since there are no more local routes.
-  routes->clear();
-  routes->push_back(fake_route_remote());
-  action()->OnRoutesUpdated(*routes.get());
-  EXPECT_TRUE(gfx::test::AreImagesEqual(
-      idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
-
-  // |current_icon_| stays the same if there are no local routes or no routes.
-  routes->clear();
-  action()->OnRoutesUpdated(*routes.get());
+  // Update |current_icon_| since there are no local routes.
+  action()->OnHasLocalRouteUpdated(false);
   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) {
-  scoped_ptr<std::vector<media_router::MediaRoute>> routes(
-      new std::vector<media_router::MediaRoute>());
-
   // 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_|.
-  routes->push_back(fake_route_remote());
-  action()->OnRoutesUpdated(*routes.get());
+  action()->OnHasLocalRouteUpdated(false);
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       idle_icon(), action()->GetIcon(nullptr, gfx::Size())));
 
   // Update |current_icon_| since there is a local route.
-  routes->clear();
-  routes->push_back(fake_route_local());
-  action()->OnRoutesUpdated(*routes.get());
+  action()->OnHasLocalRouteUpdated(true);
   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())));
 
-  // Swapping the local route for a non-local one makes no difference to the
-  // |current_icon_|.
-  routes->clear();
-  routes->push_back(fake_route_remote());
-  action()->OnRoutesUpdated(*routes.get());
+  // Closing a local route makes no difference to |current_icon_|.
+  action()->OnHasLocalRouteUpdated(false);
   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.
-  routes->clear();
-  routes->push_back(fake_route_local());
-  action()->OnRoutesUpdated(*routes.get());
+  action()->OnHasLocalRouteUpdated(true);
   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 swapped out for a non-local
-  // route.
-  routes->clear();
-  routes->push_back(fake_route_remote());
-  action()->OnRoutesUpdated(*routes.get());
+  // Update |current_icon_| when the local route is closed.
+  action()->OnHasLocalRouteUpdated(false);
   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 26 matching lines @@
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());
   dialog_controller_->Reset();
 
   EXPECT_CALL(*mock_delegate, OnPopupShown(true)).WillOnce(testing::Return());
   dialog_controller_->CreateMediaRouterDialog();
 
   EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());
   dialog_controller_->CloseMediaRouterDialog();
 }