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

chrome/android/javatests/src/org/chromium/chrome/browser/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;
 
 import android.os.Environment;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.Smoke;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.infobar.InfoBarContainer;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.InfoBarTestAnimationListener;
 import org.chromium.chrome.test.util.InfoBarUtil;
 import org.chromium.chrome.test.util.browser.LocationSettingsTestUtil;
-import org.chromium.content.browser.LocationProviderFactory;
 import org.chromium.content.browser.test.util.CallbackHelper;
-import org.chromium.content.browser.test.util.MockLocationProvider;
+import org.chromium.device.geolocation.LocationProviderFactory;
+import org.chromium.device.geolocation.MockLocationProvider;
 import org.chromium.net.test.EmbeddedTestServer;
 
 /**
  * Test suite for Geo-Location functionality.
  *
  * These tests rely on the device being specially setup (which the bots do automatically):
  * - Global location is enabled.
  * - Google location is enabled.
  */
 public class GeolocationTest extends ChromeActivityTestCaseBase<ChromeActivity> {
@@ skipping 101 matching lines @@
         updateWaiter.waitForNumUpdates(2);
 
         tab.removeObserver(updateWaiter);
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 }