Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

android_webview/browser/aw_browser_main_parts.cc

 // Copyright (c) 2012 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.
 
 #include "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
 #include "base/android/apk_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "components/crash/content/browser/crash_micro_dump_manager_android.h"
+#include "content/public/browser/access_token_store.h"
 #include "content/public/browser/android/synchronous_compositor.h"
+#include "content/public/browser/geolocation_delegate.h"
+#include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
-#include "device/geolocation/access_token_store.h"
-#include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/geolocation_provider.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/gl_surface.h"
 
 namespace android_webview {
 namespace {
 
-class AwAccessTokenStore : public device::AccessTokenStore {
+class AwAccessTokenStore : public content::AccessTokenStore {
  public:
   AwAccessTokenStore() { }
 
-  // device::AccessTokenStore implementation
+  // content::AccessTokenStore implementation
   void LoadAccessTokens(const LoadAccessTokensCallback& request) override {
     AccessTokenStore::AccessTokenMap access_token_map;
     // AccessTokenMap and net::URLRequestContextGetter not used on Android,
     // but Run needs to be called to finish the geolocation setup.
     request.Run(access_token_map, NULL);
   }
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override {}
 
  private:
   ~AwAccessTokenStore() override {}
 
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
 // A provider of Geolocation services to override AccessTokenStore.
-class AwGeolocationDelegate : public device::GeolocationDelegate {
+class AwGeolocationDelegate : public content::GeolocationDelegate {
  public:
   AwGeolocationDelegate() = default;
 
-  scoped_refptr<device::AccessTokenStore> CreateAccessTokenStore() final {
+  scoped_refptr<content::AccessTokenStore> CreateAccessTokenStore() final {
     return new AwAccessTokenStore();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwGeolocationDelegate);
 };
 
 }  // anonymous namespace
 
 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
@@ skipping 40 matching lines @@
     // Create the renderers crash manager on the UI thread.
     breakpad::CrashMicroDumpManager::GetInstance();
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void AwBrowserMainParts::PreMainMessageLoopRun() {
   browser_context_->PreMainMessageLoopRun();
 
-  device::GeolocationProvider::SetGeolocationDelegate(
+  content::GeolocationProvider::SetGeolocationDelegate(
       new AwGeolocationDelegate());
 
   AwDevToolsDiscoveryProvider::Install();
 
   content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview