| Index: chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
|
| index 3b05af8c1169175f1540550741749a0e0dc76abd..2766cf4f15d6322b73e7a55afa1b6e35432d44e1 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ItemChooserDialogTest.java
|
| @@ -8,7 +8,6 @@ import android.app.Dialog;
|
| import android.graphics.drawable.Drawable;
|
| import android.support.graphics.drawable.VectorDrawableCompat;
|
| import android.support.test.filters.LargeTest;
|
| -import android.test.MoreAsserts;
|
| import android.test.UiThreadTest;
|
| import android.text.SpannableString;
|
| import android.view.View;
|
| @@ -40,12 +39,10 @@ public class ItemChooserDialogTest extends ChromeActivityTestCaseBase<ChromeActi
|
| String mLastSelectedId = "None";
|
|
|
| Drawable mTestDrawable1;
|
| - Drawable mTestDrawableSelected1;
|
| String mTestDrawableDescription1;
|
| ItemChooserDialog.ItemChooserRowIcon mTestIcon1;
|
|
|
| Drawable mTestDrawable2;
|
| - Drawable mTestDrawableSelected2;
|
| String mTestDrawableDescription2;
|
| ItemChooserDialog.ItemChooserRowIcon mTestIcon2;
|
|
|
| @@ -61,20 +58,14 @@ public class ItemChooserDialogTest extends ChromeActivityTestCaseBase<ChromeActi
|
| mChooserDialog = createDialog();
|
|
|
| mTestDrawable1 = getNewTestDrawable();
|
| - mTestDrawableSelected1 = getNewTestDrawable();
|
| - MoreAsserts.assertNotEqual(
|
| - mTestDrawable1.getConstantState(), mTestDrawableSelected1.getConstantState());
|
| mTestDrawableDescription1 = "icon1 description";
|
| - mTestIcon1 = new ItemChooserDialog.ItemChooserRowIcon(
|
| - mTestDrawable1, mTestDrawableSelected1, mTestDrawableDescription1);
|
| + mTestIcon1 =
|
| + new ItemChooserDialog.ItemChooserRowIcon(mTestDrawable1, mTestDrawableDescription1);
|
|
|
| mTestDrawable2 = getNewTestDrawable();
|
| - mTestDrawableSelected2 = getNewTestDrawable();
|
| - MoreAsserts.assertNotEqual(
|
| - mTestDrawable2.getConstantState(), mTestDrawableSelected2.getConstantState());
|
| mTestDrawableDescription2 = "icon2 description";
|
| - mTestIcon2 = new ItemChooserDialog.ItemChooserRowIcon(
|
| - mTestDrawable2, mTestDrawableSelected2, mTestDrawableDescription2);
|
| + mTestIcon2 =
|
| + new ItemChooserDialog.ItemChooserRowIcon(mTestDrawable2, mTestDrawableDescription2);
|
|
|
| assertFalse(ApiCompatibilityUtils.objectEquals(mTestIcon1, mTestIcon2));
|
| }
|
|
|