Revert of Reland: Geolocation: move from content/browser to device/

android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java

 // Copyright 2013 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.android_webview.test;
 
 import android.content.Context;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.GeolocationPermissions;
 
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.Feature;
-import org.chromium.device.geolocation.LocationProviderFactory;
-import org.chromium.device.geolocation.MockLocationProvider;
+import org.chromium.content.browser.LocationProviderFactory;
+import org.chromium.content.browser.test.util.MockLocationProvider;
 
 import java.util.concurrent.Callable;
 
 /**
  * Test suite for Geolocation in AwContents. Smoke tests for
  * basic functionality, and tests to ensure the AwContents.onPause
  * and onResume APIs affect Geolocation as expected.
  */
 public class GeolocationTest extends AwTestBase {
     private TestAwContentsClient mContentsClient;
@@ skipping 322 matching lines @@
 
         pollInstrumentationThread(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() > 0;
             }
         });
     }
 
 }