Cleanup Icon Row custom code.

chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
index 6c31a21dd7335d44edbc349c50ebffe9ed62e423..be930283d272076244c3ee7d829cad55531992ab 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/appmenu/AppMenuTest.java
@@ -87,11 +87,11 @@ public class AppMenuTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testKeyboardMenuBoundaries() throws InterruptedException {
         moveToBoundary(false, true);
-        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedRow());
         moveToBoundary(true, true);
-        assertEquals(0, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(0, mAppMenu.getCurrentFocusedRow());
         moveToBoundary(false, true);
-        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedRow());
     }
 
     /**
@@ -110,7 +110,7 @@ public class AppMenuTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testKeyboardEnterAfterMovePastTopItem() throws InterruptedException {
         moveToBoundary(true, true);
-        assertEquals(0, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(0, mAppMenu.getCurrentFocusedRow());
         hitEnterAndAssertItemSelected();
     }
 
@@ -122,7 +122,7 @@ public class AppMenuTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testKeyboardEnterAfterMovePastBottomItem() throws InterruptedException {
         moveToBoundary(false, true);
-        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(mAppMenu.getCount() - 1, mAppMenu.getCurrentFocusedRow());
         hitEnterAndAssertItemSelected();
     }
 
@@ -135,7 +135,7 @@ public class AppMenuTest extends ChromeShellTestBase {
     public void testKeyboardMenuEnterOnTopItemLandscape() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         moveToBoundary(true, false);
-        assertEquals(0, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(0, mAppMenu.getCurrentFocusedRow());
         hitEnterAndAssertItemSelected();
     }
 
@@ -147,12 +147,13 @@ public class AppMenuTest extends ChromeShellTestBase {
     public void testKeyboardMenuEnterOnTopItemPortrait() throws InterruptedException {
         getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
         moveToBoundary(true, false);
-        assertEquals(0, mAppMenu.getCurrentFocusedPosition());
+        assertEquals(0, mAppMenu.getCurrentFocusedRow());
         hitEnterAndAssertItemSelected();
     }
 
     private void hitEnterAndAssertItemSelected() throws InterruptedException {
-        final int expectedItemId = mAppMenu.getCurrentFocusedItemId();
+        View row = mAppMenu.getCurrentFocusedRowView();
+        final int expectedItemId = -1;
         pressKey(KeyEvent.KEYCODE_ENTER);
         assertTrue("Did not select a correct menu item",
                 CriteriaHelper.pollForCriteria(new Criteria() {
@@ -167,14 +168,14 @@ public class AppMenuTest extends ChromeShellTestBase {
         // Move to the boundary.
         final int end = towardsTop ? 0 : mAppMenu.getCount() - 1;
         int increment = towardsTop ? -1 : 1;
-        for (int index = mAppMenu.getCurrentFocusedPosition(); index != end; index += increment) {
+        for (int index = mAppMenu.getCurrentFocusedRow(); index != end; index += increment) {
             pressKey(towardsTop ? KeyEvent.KEYCODE_DPAD_UP : KeyEvent.KEYCODE_DPAD_DOWN);
             final int expectedPosition = index + increment;
             assertTrue("Focus did not move to the next menu item",
                     CriteriaHelper.pollForCriteria(new Criteria() {
                         @Override
                         public boolean isSatisfied() {
-                            return mAppMenu.getCurrentFocusedPosition() == expectedPosition;
+                            return mAppMenu.getCurrentFocusedRow() == expectedPosition;
                         }
                     }));
         }
@@ -186,7 +187,7 @@ public class AppMenuTest extends ChromeShellTestBase {
                     CriteriaHelper.pollForCriteria(new Criteria() {
                         @Override
                         public boolean isSatisfied() {
-                            return mAppMenu.getCurrentFocusedPosition() == end;
+                            return mAppMenu.getCurrentFocusedRow() == end;
                         }
                     }));
         }