Adds EngineGeolocationFeature for Blimp Geolocation project.

blimp/engine/app/blimp_content_browser_client.cc

 // Copyright (c) 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.
 
 #include "blimp/engine/app/blimp_content_browser_client.h"
 #include "blimp/engine/app/blimp_browser_main_parts.h"
 #include "blimp/engine/app/settings_manager.h"
 #include "blimp/engine/feature/geolocation/blimp_location_provider.h"
+#include "blimp/engine/feature/geolocation/engine_geolocation_feature.h"
 #include "blimp/engine/mojo/blob_channel_service.h"
+#include "blimp/engine/session/blimp_engine_session.h"
 #include "content/public/browser/geolocation_delegate.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
 namespace blimp {
 namespace engine {
 
-namespace {
-// A provider of services needed by Geolocation.
-class BlimpGeolocationDelegate : public content::GeolocationDelegate {
- public:
-  BlimpGeolocationDelegate() = default;
-
-  bool UseNetworkLocationProviders() final { return false; }
-
-  std::unique_ptr<content::LocationProvider> OverrideSystemLocationProvider()
-      final {
-    return base::WrapUnique(new BlimpLocationProvider());
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(BlimpGeolocationDelegate);
-};
-
-}  // anonymous namespace
-
 BlimpContentBrowserClient::BlimpContentBrowserClient() {}
 
 BlimpContentBrowserClient::~BlimpContentBrowserClient() {}
 
 content::BrowserMainParts* BlimpContentBrowserClient::CreateBrowserMainParts(
     const content::MainFunctionParams& parameters) {
   blimp_browser_main_parts_ = new BlimpBrowserMainParts(parameters);
   // BrowserMainLoop takes ownership of the returned BrowserMainParts.
   return blimp_browser_main_parts_;
 }
 
 void BlimpContentBrowserClient::OverrideWebkitPrefs(
     content::RenderViewHost* render_view_host,
     content::WebPreferences* prefs) {
   if (!blimp_browser_main_parts_)
     return;
 
   if (!blimp_browser_main_parts_->GetSettingsManager())
     return;
 
   blimp_browser_main_parts_->GetSettingsManager()->UpdateWebkitPreferences(
       prefs);
 }
 
 BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() {
   return blimp_browser_main_parts_->GetBrowserContext();
 }
 
 content::GeolocationDelegate*

[Kevin M, 2016/07/19 16:01:41]

no action required for this CL: I so wish this was unique_ptr :F

[CJ, 2016/07/19 20:35:58]

Agreed.

 BlimpContentBrowserClient::CreateGeolocationDelegate() {
-  return new BlimpGeolocationDelegate();
+  EngineGeolocationFeature* geolocation_feature = blimp_browser_main_parts()
+                                                      ->GetBlimpEngineSession()
+                                                      ->GetGeolocationFeature();
+  return geolocation_feature->CreateGeolocationDelegate().release();
 }
 
 void BlimpContentBrowserClient::ExposeInterfacesToRenderer(
     shell::InterfaceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddInterface<mojom::BlobChannel>(
       base::Bind(&BlobChannelService::Create,
                  blimp_browser_main_parts_->GetBlobChannelSender()));
 }
 
 }  // namespace engine
 }  // namespace blimp