[Cast,Android] Handle some PresentationAPI edge cases

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

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 15dea85648e940770e6a6e9dc00ea2166a882ff1..ca33b8dd1b0a3b0d981902f44ca506b249667ae6 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
@@ -35,7 +35,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
             new CastMediaRouteProvider.Builder();
 
     // The pointer to the native object. Can be null only during tests.
-    private final long mNativeMediaRouterAndroid;
+    private final long mNativeMediaRouterAndroidBridge;
     private final List<MediaRouteProvider> mRouteProviders = new ArrayList<MediaRouteProvider>();
     private final Map<String, MediaRouteProvider> mRouteIdsToProviders =
             new HashMap<String, MediaRouteProvider>();
@@ -114,8 +114,9 @@ public class ChromeMediaRouter implements MediaRouteManager {
         for (List<MediaSink> s : sinksPerProvider.values()) allSinksPerSource.addAll(s);
 
         mSinksPerSource.put(sourceId, allSinksPerSource);
-        if (mNativeMediaRouterAndroid != 0) {
-            nativeOnSinksReceived(mNativeMediaRouterAndroid, sourceId, allSinksPerSource.size());
+        if (mNativeMediaRouterAndroidBridge != 0) {
+            nativeOnSinksReceived(
+                    mNativeMediaRouterAndroidBridge, sourceId, allSinksPerSource.size());
         }
     }
 
@@ -124,53 +125,53 @@ public class ChromeMediaRouter implements MediaRouteManager {
             String mediaRouteId, String mediaSinkId, int requestId, MediaRouteProvider provider,
             boolean wasLaunched) {
         mRouteIdsToProviders.put(mediaRouteId, provider);
-        if (mNativeMediaRouterAndroid != 0) {
-            nativeOnRouteCreated(mNativeMediaRouterAndroid, mediaRouteId, mediaSinkId, requestId,
-                    wasLaunched);
+        if (mNativeMediaRouterAndroidBridge != 0) {
+            nativeOnRouteCreated(mNativeMediaRouterAndroidBridge, mediaRouteId, mediaSinkId,
+                    requestId, wasLaunched);
         }
     }
 
     @Override
     public void onRouteRequestError(String errorText, int requestId) {
-        if (mNativeMediaRouterAndroid != 0) {
-            nativeOnRouteRequestError(mNativeMediaRouterAndroid, errorText, requestId);
+        if (mNativeMediaRouterAndroidBridge != 0) {
+            nativeOnRouteRequestError(mNativeMediaRouterAndroidBridge, errorText, requestId);
         }
     }
 
     @Override
     public void onRouteClosed(String mediaRouteId) {
-        if (mNativeMediaRouterAndroid != 0) {
-            nativeOnRouteClosed(mNativeMediaRouterAndroid, mediaRouteId);
+        if (mNativeMediaRouterAndroidBridge != 0) {
+            nativeOnRouteClosed(mNativeMediaRouterAndroidBridge, mediaRouteId);
         }
         mRouteIdsToProviders.remove(mediaRouteId);
     }
 
     @Override
     public void onRouteClosedWithError(String mediaRouteId, String message) {
-        if (mNativeMediaRouterAndroid != 0) {
-            nativeOnRouteClosedWithError(mNativeMediaRouterAndroid, mediaRouteId, message);
+        if (mNativeMediaRouterAndroidBridge != 0) {
+            nativeOnRouteClosedWithError(mNativeMediaRouterAndroidBridge, mediaRouteId, message);
         }
         mRouteIdsToProviders.remove(mediaRouteId);
     }
 
     @Override
     public void onMessageSentResult(boolean success, int callbackId) {
-        nativeOnMessageSentResult(mNativeMediaRouterAndroid, success, callbackId);
+        nativeOnMessageSentResult(mNativeMediaRouterAndroidBridge, success, callbackId);
     }
 
     @Override
     public void onMessage(String mediaRouteId, String message) {
-        nativeOnMessage(mNativeMediaRouterAndroid, mediaRouteId, message);
+        nativeOnMessage(mNativeMediaRouterAndroidBridge, mediaRouteId, message);
     }
 
     /**
      * Initializes the media router and its providers.
-     * @param nativeMediaRouterAndroid the handler for the native counterpart of this instance
+     * @param nativeMediaRouterAndroidBridge the handler for the native counterpart of this instance
      * @return an initialized {@link ChromeMediaRouter} instance
      */
     @CalledByNative
-    public static ChromeMediaRouter create(long nativeMediaRouterAndroid) {
-        ChromeMediaRouter router = new ChromeMediaRouter(nativeMediaRouterAndroid);
+    public static ChromeMediaRouter create(long nativeMediaRouterAndroidBridge) {
+        ChromeMediaRouter router = new ChromeMediaRouter(nativeMediaRouterAndroidBridge);
         MediaRouteProvider provider = sRouteProviderBuilder.create(router);
         if (provider != null) router.addMediaRouteProvider(provider);
 
@@ -326,7 +327,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
     public void sendStringMessage(String routeId, String message, int callbackId) {
         MediaRouteProvider provider = mRouteIdsToProviders.get(routeId);
         if (provider == null) {
-            nativeOnMessageSentResult(mNativeMediaRouterAndroid, false, callbackId);
+            nativeOnMessageSentResult(mNativeMediaRouterAndroidBridge, false, callbackId);
             return;
         }
 
@@ -334,8 +335,8 @@ public class ChromeMediaRouter implements MediaRouteManager {
     }
 
     @VisibleForTesting
-    protected ChromeMediaRouter(long nativeMediaRouter) {
-        mNativeMediaRouterAndroid = nativeMediaRouter;
+    protected ChromeMediaRouter(long nativeMediaRouterAndroidBridge) {
+        mNativeMediaRouterAndroidBridge = nativeMediaRouterAndroidBridge;
     }
 
     @VisibleForTesting
@@ -356,19 +357,16 @@ public class ChromeMediaRouter implements MediaRouteManager {
     }
 
     native void nativeOnSinksReceived(
-            long nativeMediaRouterAndroid, String sourceUrn, int count);
-    native void nativeOnRouteCreated(
-            long nativeMediaRouterAndroid,
-            String mediaRouteId,
-            String mediaSinkId,
-            int createRouteRequestId,
-            boolean wasLaunched);
+            long nativeMediaRouterAndroidBridge, String sourceUrn, int count);
+    native void nativeOnRouteCreated(long nativeMediaRouterAndroidBridge, String mediaRouteId,
+            String mediaSinkId, int createRouteRequestId, boolean wasLaunched);
     native void nativeOnRouteRequestError(
-            long nativeMediaRouterAndroid, String errorText, int createRouteRequestId);
-    native void nativeOnRouteClosed(long nativeMediaRouterAndroid, String mediaRouteId);
+            long nativeMediaRouterAndroidBridge, String errorText, int createRouteRequestId);
+    native void nativeOnRouteClosed(long nativeMediaRouterAndroidBridge, String mediaRouteId);
     native void nativeOnRouteClosedWithError(
-            long nativeMediaRouterAndroid, String mediaRouteId, String message);
+            long nativeMediaRouterAndroidBridge, String mediaRouteId, String message);
     native void nativeOnMessageSentResult(
-            long nativeMediaRouterAndroid, boolean success, int callbackId);
-    native void nativeOnMessage(long nativeMediaRouterAndroid, String mediaRouteId, String message);
+            long nativeMediaRouterAndroidBridge, boolean success, int callbackId);
+    native void nativeOnMessage(
+            long nativeMediaRouterAndroidBridge, String mediaRouteId, String message);
 }