cros: Fix various small issues with cast tray entry.

cros: Fix various small issues with cast tray entry.

673023: Do not show TrayCast active state until we have media router
information to prevent short visual glitch where we are "Casting to
unknown receiver".

683908: Only show local routes

671094: Better accessibility label for Stop casting button.

BUG=673023, 683908, 671094
Review-Url: https://codereview.chromium.org/2656003006
Cr-Commit-Position: refs/heads/master@{#447045}
Committed: https://chromium.googlesource.com/chromium/src/+/4e949b4732c4d76670a39719a73422ed0dc2976c

[jdufault, 2017-01-27 22:02:45]

The CQ bit was checked by jdufault@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-27 22:03:24]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-27 23:27:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-27 23:27:50]

Dry run: Try jobs failed on following builders:
  linux_chromium_chromeos_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[jdufault, 2017-01-27 23:48:22]

The CQ bit was checked by jdufault@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-01-27 23:49:05]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[jdufault, 2017-01-27 23:49:56]

Patchset #1 (id:1) has been deleted

[commit-bot: I haz the power, 2017-01-28 00:38:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-28 00:38:18]

Dry run: This issue passed the CQ dry run.

[jdufault, 2017-01-28 00:50:12]

Description was changed from

==========
cros: Fix various small issues with cast tray entry.

673023: Do not show TrayCast active state until we have media router
information to prevent short visual glitch where we are "Casting to
unknown receiver".

683908: Only show local routes

671094: Better accessibility label for Stop casting button.

BUG=673023,683908,671094
==========

to

==========
cros: Fix various small issues with cast tray entry.

673023: Do not show TrayCast active state until we have media router
information to prevent short visual glitch where we are "Casting to
unknown receiver".

683908: Only show local routes

671094: Better accessibility label for Stop casting button.

BUG=673023,683908,671094
==========

[jdufault, 2017-01-28 00:50:12]

jdufault@chromium.org changed reviewers:
+ achuith@chromium.org, stevenjb@chromium.org

[jdufault, 2017-01-28 00:50:35]

jdufault@chromium.org changed reviewers:
- achuith@chromium.org

[jdufault, 2017-01-28 00:50:50]

stevenjb@ PTAL. Thanks

[stevenjb, 2017-01-28 01:05:46]

lgtm with one suggestion

https://codereview.chromium.org/2656003006/diff/20001/ash/ash_strings.grd
File ash/ash_strings.grd (right):

https://codereview.chromium.org/2656003006/diff/20001/ash/ash_strings.grd#new...
ash/ash_strings.grd:257: </message>
nit: I think it might actually be easier to maintain if we interleave the _STOP
strings with the other strings, and name them e.g.
IDS_ASH_STATUS_TRAY_CAST_CAST_DESKTOP_ACCESSIBILITY_STOP

[jdufault, 2017-01-28 01:15:38]

https://codereview.chromium.org/2656003006/diff/20001/ash/ash_strings.grd
File ash/ash_strings.grd (right):

https://codereview.chromium.org/2656003006/diff/20001/ash/ash_strings.grd#new...
ash/ash_strings.grd:257: </message>
On 2017/01/28 01:05:46, stevenjb wrote:
> nit: I think it might actually be easier to maintain if we interleave the
_STOP
> strings with the other strings, and name them e.g.
> IDS_ASH_STATUS_TRAY_CAST_CAST_DESKTOP_ACCESSIBILITY_STOP

Done; I was considering interleaving but didn't consider adding STOP as a
postfix.

[jdufault, 2017-01-28 01:15:41]

The CQ bit was checked by jdufault@chromium.org

[jdufault, 2017-01-28 01:15:41]

The patchset sent to the CQ was uploaded after l-g-t-m from
stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2656003006/#ps40001
(title: "Address comments")

[commit-bot: I haz the power, 2017-01-28 01:16:12]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-28 01:56:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-01-28 01:56:41]

Failed to apply patch for
chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc:
While running git apply --index -p1;
  error: patch failed:
chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc:151
  error:
chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc:
patch does not apply

Patch:      
chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
Index:
chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
diff --git
a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
index
0184f44c720a58f1076e029516dc6f71cfbea553..bd4f50e54d92d0e333b47985e47d4c93627ef02a
100644
---
a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
+++
b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc
@@ -35,9 +35,8 @@ media_router::MediaRoute MakeRoute(const std::string&
route_id,
                                    const std::string& sink_id,
                                    bool is_local) {
   return media_router::MediaRoute(
-      route_id, media_router::MediaSourceForDesktop(), sink_id,
-      std::string() /*description*/, is_local,
-      std::string() /*custom_controller_path*/, true /*for_display*/);
+      route_id, media_router::MediaSourceForDesktop(), sink_id, "description",
+      is_local, std::string() /*custom_controller_path*/, true
/*for_display*/);
 }
 
 // Returns the cast tray instance.
@@ -151,22 +150,28 @@
IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,
   EXPECT_TRUE(test_api.IsTrayInitialized());
 
   // Setup the sinks.
-  std::vector<media_router::MediaSink> sinks;
-  sinks.push_back(MakeSink("remote_sink", "name"));
-  sinks.push_back(MakeSink("local_sink", "name"));
+  const std::vector<media_router::MediaSink> sinks = {
+      MakeSink("remote_sink", "name"), MakeSink("local_sink", "name")};
   media_sinks_observer()->OnSinksUpdated(sinks, std::vector<GURL>());
   content::RunAllPendingInMessageLoop();
 
   // Create route combinations. More details below.
-  media_router::MediaRoute non_local_route =
+  const media_router::MediaRoute non_local_route =
       MakeRoute("remote_route", "remote_sink", false /*is_local*/);
-  media_router::MediaRoute local_route =
+  const media_router::MediaRoute local_route =
       MakeRoute("local_route", "local_sink", true /*is_local*/);
-  std::vector<media_router::MediaRoute> no_routes;
-  std::vector<media_router::MediaRoute> multiple_routes;
+  const std::vector<media_router::MediaRoute> no_routes;
+  const std::vector<media_router::MediaRoute>
non_local_routes{non_local_route};
   // We put the non-local route first to make sure that we prefer the local
one.
-  multiple_routes.push_back(non_local_route);
-  multiple_routes.push_back(local_route);
+  const std::vector<media_router::MediaRoute> multiple_routes{non_local_route,
+                                                              local_route};
+
+  // We do not show the cast view for non-local routes.
+  test_api.OnCastingSessionStartedOrStopped(true /*is_casting*/);
+  media_routes_observer()->OnRoutesUpdated(
+      non_local_routes, std::vector<media_router::MediaRoute::Id>());
+  content::RunAllPendingInMessageLoop();
+  EXPECT_FALSE(test_api.IsTrayCastViewVisible());
 
   // If there are multiple routes active at the same time, then we need to
   // display the local route over a non-local route. This also verifies that we

[jdufault, 2017-01-30 19:21:29]

The CQ bit was checked by jdufault@chromium.org

[jdufault, 2017-01-30 19:21:29]

The patchset sent to the CQ was uploaded after l-g-t-m from
stevenjb@chromium.org
Link to the patchset: https://codereview.chromium.org/2656003006/#ps60001
(title: "Rebase")

[commit-bot: I haz the power, 2017-01-30 19:22:01]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-01-30 20:08:03]

CQ is committing da patch.

Bot data: {"patchset_id": 60001, "attempt_start_ts": 1485804089085370,
"parent_rev": "403407423dd9eb399eabed52a27550c854332ff9", "commit_rev":
"4e949b4732c4d76670a39719a73422ed0dc2976c"}

[commit-bot: I haz the power, 2017-01-30 20:08:49]

Description was changed from

==========
cros: Fix various small issues with cast tray entry.

673023: Do not show TrayCast active state until we have media router
information to prevent short visual glitch where we are "Casting to
unknown receiver".

683908: Only show local routes

671094: Better accessibility label for Stop casting button.

BUG=673023,683908,671094
==========

to

==========
cros: Fix various small issues with cast tray entry.

673023: Do not show TrayCast active state until we have media router
information to prevent short visual glitch where we are "Casting to
unknown receiver".

683908: Only show local routes

671094: Better accessibility label for Stop casting button.

BUG=673023,683908,671094

Review-Url: https://codereview.chromium.org/2656003006
Cr-Commit-Position: refs/heads/master@{#447045}
Committed:
https://chromium.googlesource.com/chromium/src/+/4e949b4732c4d76670a39719a734...
==========

[commit-bot: I haz the power, 2017-01-30 20:08:51]

Committed patchset #3 (id:60001) as
https://chromium.googlesource.com/chromium/src/+/4e949b4732c4d76670a39719a734...