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

content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.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.content.browser;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.browser.test.util.MockLocationProvider;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnEvaluateJavaScriptResultHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_shell_apk.ContentShellTestBase;
+import org.chromium.device.geolocation.LocationProviderFactory;
+import org.chromium.device.geolocation.MockLocationProvider;
 
 import java.util.concurrent.Callable;
 
 /**
  * Test suite for ensureing that Geolocation interacts as expected
  * with ContentView APIs - e.g. that it's started and stopped as the
  * ContentView is hidden or shown.
  */
 public class ContentViewLocationTest extends ContentShellTestBase {
 
@@ skipping 143 matching lines @@
         hideContentViewOnUiThread();
         startGeolocationWatchPosition();
         ensureGeolocationRunning(false);
 
         loadUrl(getContentViewCore().getWebContents().getNavigationController(),
                 mTestCallbackHelperContainer, new LoadUrlParams("about:blank"));
         showContentViewOnUiThread();
         ensureGeolocationRunning(false);
     }
 }