Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java

Issue 2783363002: [Android,Cast] Report correctly when devices are not available. (Closed)
Patch Set: Fixed the test URLs Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
index 63675319990dea464958f2b487e6620d2b2e0a0e..15dea85648e940770e6a6e9dc00ea2166a882ff1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java
@@ -43,6 +43,14 @@ public class ChromeMediaRouter implements MediaRouteManager {
new HashMap<String, Map<MediaRouteProvider, List<MediaSink>>>();
private final Map<String, List<MediaSink>> mSinksPerSource =
new HashMap<String, List<MediaSink>>();
+ private static boolean sAndroidMediaRouterSetForTest = false;
+ private static MediaRouter sAndroidMediaRouterForTest = null;
+
+ @VisibleForTesting
+ public static void setAndroidMediaRouterForTest(MediaRouter router) {
+ sAndroidMediaRouterSetForTest = true;
+ sAndroidMediaRouterForTest = router;
+ }
@VisibleForTesting
public static void setRouteProviderBuilderForTest(MediaRouteProvider.Builder builder) {
@@ -76,6 +84,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
*/
@Nullable
public static MediaRouter getAndroidMediaRouter() {
+ if (sAndroidMediaRouterSetForTest) return sAndroidMediaRouterForTest;
try {
// Pre-MR1 versions of JB do not have the complete MediaRouter APIs,
// so getting the MediaRouter instance will throw an exception.
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouterDialogController.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698