Replace deprecated Android java test annotations

chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java
index 2ac8ac9c331a0bc64788528f6a038328addd72c5..4bc5a3d530f572ca09baeced4e47e14cf3ae0df9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.java
@@ -4,9 +4,8 @@
 
 package org.chromium.chrome.browser.permissions;
 
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.Smoke;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.MediumTest;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
@@ -54,7 +53,6 @@ public class GeolocationTest extends PermissionTestCaseBase {
      * Verify Geolocation creates an InfoBar and receives a mock location.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @Feature({"Location", "Main"})
     public void testGeolocationPlumbingAllowedInfoBar() throws Exception {
@@ -65,7 +63,6 @@ public class GeolocationTest extends PermissionTestCaseBase {
      * Verify Geolocation creates a dialog and receives a mock location.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add("enable-features=" + MODAL_FLAG)
     @Feature({"Location", "Main"})
@@ -78,7 +75,6 @@ public class GeolocationTest extends PermissionTestCaseBase {
      * enabled and permitted to trigger without a gesture.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add({NO_GESTURE_FEATURE, FORCE_FIELDTRIAL, FORCE_FIELDTRIAL_PARAMS})
     @Feature({"Location", "Main"})
@@ -91,7 +87,6 @@ public class GeolocationTest extends PermissionTestCaseBase {
      * no user gesture is specified.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add("enable-features=" + MODAL_FLAG)
     @Feature({"Location", "Main"})