Replace deprecated Android java test annotations

chrome/android/javatests/src/org/chromium/chrome/browser/permissions/GeolocationTest.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.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;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.util.browser.LocationSettingsTestUtil;
 import org.chromium.device.geolocation.LocationProviderFactory;
 import org.chromium.device.geolocation.MockLocationProvider;
 
 /**
@@ skipping 27 matching lines @@
         tab.addObserver(updateWaiter);
         runAllowTest(updateWaiter, TEST_FILE, javascript, nUpdates, withGesture, isDialog,
                 hasSwitch, toggleSwitch);
         tab.removeObserver(updateWaiter);
     }
 
     /**
      * Verify Geolocation creates an InfoBar and receives a mock location.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add("disable-features=" + MODAL_FLAG)
     @Feature({"Location", "Main"})
     public void testGeolocationPlumbingAllowedInfoBar() throws Exception {
         runTest("initiate_getCurrentPosition()", 1, false, false, false, false);
     }
 
     /**
      * Verify Geolocation creates a dialog and receives a mock location.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add("enable-features=" + MODAL_FLAG)
     @Feature({"Location", "Main"})
     public void testGeolocationPlumbingAllowedDialog() throws Exception {
         runTest("initiate_getCurrentPosition()", 1, true, true, false, false);
     }
 
     /**
      * Verify Geolocation creates a dialog and receives a mock location when dialogs are explicitly
      * 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"})
     public void testGeolocationPlumbingAllowedDialogNoGesture() throws Exception {
         runTest("initiate_getCurrentPosition()", 1, false, true, false, false);
     }
 
     /**
      * Verify Geolocation shows an infobar and receives a mock location if the modal flag is on but
      * no user gesture is specified.
      * @throws Exception
      */
-    @Smoke
     @MediumTest
     @CommandLineFlags.Add("enable-features=" + MODAL_FLAG)
     @Feature({"Location", "Main"})
     public void testGeolocationPlumbingAllowedNoGestureShowsInfoBar() throws Exception {
         runTest("initiate_getCurrentPosition()", 1, false, false, false, false);
     }
 
     /**
      * Verify Geolocation creates an InfoBar and receives multiple locations.
      * @throws Exception
@@ skipping 111 matching lines @@
      * that feature is enabled. Use a dialog.
      * @throws Exception
      */
     @LargeTest
     @CommandLineFlags.Add("enable-features=" + MODAL_TOGGLE_FLAG)
     @Feature({"Location"})
     public void testGeolocationWatchPersistenceOffAllowedDialog() throws Exception {
         runTest("initiate_watchPosition()", 2, true, true, true, true);
     }
 }