Reordering media controls.

chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
index a573fcb55303b6a4efa090066275b98e26f6822e..80dddc050292c263df72bc31acf553388d8d27ba 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
@@ -535,7 +535,7 @@ public abstract class CastTestBase extends ChromeActivityTestCaseBase<ChromeActi
         return new Rect(left, bar.top, right, bar.bottom);
     }
 
-    private Rect downloadButton(Rect videoRect) {
+    private Rect castButton(Rect videoRect) {
         Rect bar = controlBar(videoRect);
         int right = bar.right - BUTTON_RIGHT_MARGIN;
         int left = right - BUTTON_WIDTH;
@@ -549,11 +549,11 @@ public abstract class CastTestBase extends ChromeActivityTestCaseBase<ChromeActi
         return new Rect(left, downloadButton.top, right, downloadButton.bottom);
     }
 
-    private Rect castButton(Rect videoRect) {
-        Rect fullscreenButton = fullscreenButton(videoRect);
-        int right = fullscreenButton.left;
+    private Rect downloadButton(Rect videoRect) {
+        Rect castButton = castButton(videoRect);
+        int right = castButton.right - BUTTON_RIGHT_MARGIN;
         int left = right - BUTTON_WIDTH;
-        return new Rect(left, fullscreenButton.top, right, fullscreenButton.bottom);
+        return new Rect(left, castButton.top, right, castButton.bottom);
     }
 
     private void tapButton(Tab tab, Rect rect) {