Replace deprecated Android java test annotations

chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarControlLayoutTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.infobar;
 
 import android.content.Context;
+import android.support.test.filters.SmallTest;
 import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.view.View;
 import android.view.View.MeasureSpec;
 import android.view.ViewGroup.LayoutParams;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.infobar.InfoBarControlLayout.ControlLayoutParams;
 
 /**
  * Tests for InfoBarControlLayout.  This suite doesn't check for specific details, like margins
  * paddings, and instead focuses on whether controls are placed correctly.
@@ skipping 146 matching lines @@
         assertEquals(2, params1.columnsRequired);
         assertEquals(INFOBAR_WIDTH, view1.getMeasuredWidth());
 
         // Small control gets shunted onto the next row.
         assertTrue(params2.top > view1.getMeasuredHeight());
         assertEquals(0, params2.start);
         assertEquals(2, params2.columnsRequired);
         assertEquals(INFOBAR_WIDTH, view2.getMeasuredWidth());
     }
 }