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

chromecast/browser/cast_browser_main_parts.cc

 // Copyright 2014 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 "chromecast/browser/cast_browser_main_parts.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <string>
@@ skipping 32 matching lines @@
 #include "chromecast/media/base/media_resource_tracker.h"
 #include "chromecast/media/base/video_plane_controller.h"
 #include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
 #include "chromecast/net/connectivity_checker.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/cast_sys_info.h"
 #include "chromecast/service/cast_service.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
+#include "content/public/browser/geolocation_delegate.h"
+#include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
-#include "device/geolocation/geolocation_delegate.h"
-#include "device/geolocation/geolocation_provider.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "media/base/media.h"
 #include "ui/compositor/compositor_switches.h"
 
 #if !defined(OS_ANDROID)
 #include <signal.h>
 #include <sys/prctl.h>
 #endif
 #if defined(OS_LINUX)
 #include <fontconfig/fontconfig.h>
@@ skipping 113 matching lines @@
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace
 
 namespace chromecast {
 namespace shell {
 
 namespace {
 
 // A provider of services for Geolocation.
-class CastGeolocationDelegate : public device::GeolocationDelegate {
+class CastGeolocationDelegate : public content::GeolocationDelegate {
  public:
   explicit CastGeolocationDelegate(CastBrowserContext* context)
       : context_(context) {}
 
-  scoped_refptr<device::AccessTokenStore> CreateAccessTokenStore() override {
+  scoped_refptr<content::AccessTokenStore> CreateAccessTokenStore() override {
     return new CastAccessTokenStore(context_);
   }
 
  private:
   CastBrowserContext* context_;
 
   DISALLOW_COPY_AND_ASSIGN(CastGeolocationDelegate);
 };
 
 struct DefaultCommandLineSwitch {
@@ skipping 256 matching lines @@
           cast_browser_process_->pref_service(),
           url_request_context_factory_->GetSystemGetter(),
           video_plane_controller_.get()));
   cast_browser_process_->cast_service()->Initialize();
 
 #if !defined(OS_ANDROID)
   media_resource_tracker()->InitializeMediaLib();
 #endif
   ::media::InitializeMediaLibrary();
 
-  device::GeolocationProvider::SetGeolocationDelegate(
+  content::GeolocationProvider::SetGeolocationDelegate(
       new CastGeolocationDelegate(cast_browser_process_->browser_context()));
 
   // Initializing metrics service and network delegates must happen after cast
   // service is intialized because CastMetricsServiceClient and
   // CastNetworkDelegate may use components initialized by cast service.
   cast_browser_process_->metrics_service_client()
       ->Initialize(cast_browser_process_->cast_service());
   url_request_context_factory_->InitializeNetworkDelegates();
 
   cast_browser_process_->cast_service()->Start();
@@ skipping 44 matching lines @@
 
 void CastBrowserMainParts::PostDestroyThreads() {
 #if !defined(OS_ANDROID)
   media_resource_tracker_->FinalizeAndDestroy();
   media_resource_tracker_ = nullptr;
 #endif
 }
 
 }  // namespace shell
 }  // namespace chromecast