Merge setMediaRouteController and setRouteController for NotificationTransportControl

chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java
index d52b561eb258fb8f57cec7909237d33df6f18d07..055ec4aa3ffa782841fc0748428c0c82dfa7bd4e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/remote/NotificationTransportControl.java
@@ -337,7 +337,7 @@ public class NotificationTransportControl
                         new RemoteVideoInfo(null, 0, RemoteVideoInfo.PlayerState.STOPPED, 0, null));
             }
 
-            sInstance.setMediaRouteController(mrc);
+            sInstance.setRouteController(mrc);
             return sInstance;
         }
     }
@@ -454,7 +454,9 @@ public class NotificationTransportControl
 
     @Override
     public void setRouteController(MediaRouteController controller) {
-        setMediaRouteController(controller);
+        if (mMediaRouteController != null)  mMediaRouteController.removeUiListener(this);
+        mMediaRouteController = controller;
+        if (controller != null) controller.addUiListener(this);
     }
 
     @Override
@@ -514,15 +516,4 @@ public class NotificationTransportControl
         return scaleBitmap(bitmap, (int) maxWidth, (int) maxHeight);
     }
 
-    /**
-     * Sets the MediaRouteController the notification should be using to get the data from.
-     *
-     * @param mrc the MediaRouteController object to use.
-     */
-    private void setMediaRouteController(@Nullable MediaRouteController mrc) {
-        if (mMediaRouteController != null)  mMediaRouteController.removeUiListener(this);
-        mMediaRouteController = mrc;
-        if (mrc != null) mrc.addUiListener(this);
-    }
-
 }