Refactor to make BlimpLocationProvider accessible to content layer.

blimp/engine/app/blimp_content_browser_client.cc

Index: blimp/engine/app/blimp_content_browser_client.cc
diff --git a/blimp/engine/app/blimp_content_browser_client.cc b/blimp/engine/app/blimp_content_browser_client.cc
index 8e88f5dfb6a19a1d6d5362c72bb9d5d37e969921..2aff245312a612e4e803e0fe52906af54de7e3cd 100644
--- a/blimp/engine/app/blimp_content_browser_client.cc
+++ b/blimp/engine/app/blimp_content_browser_client.cc
@@ -5,6 +5,7 @@
 #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/blimp_location_provider.h"#include "blimp/engine/feature/geolocation/blimp_location_provider.h"

[Wez, 2016/06/22 18:51:02]

This looks messed-up?

[CJ, 2016/06/22 20:47:29]

Oh my. Not sure what happened there. Fixed.

 #include "blimp/engine/mojo/blob_channel_service.h"
 #include "content/public/common/service_registry.h"
 
@@ -39,6 +40,18 @@ BlimpBrowserContext* BlimpContentBrowserClient::GetBrowserContext() {
   return blimp_browser_main_parts_->GetBrowserContext();
 }
 
+content::LocationProvider*
+BlimpContentBrowserClient::OverrideSystemLocationProvider() {
+  if (!location_provider_) {
+    location_provider_ = base::WrapUnique(new BlimpLocationProvider());
+  }
+  return location_provider_.get();
+}
+
+bool BlimpContentBrowserClient::UseNetworkLocationProviders() {
+  return false;
+}
+
 void BlimpContentBrowserClient::RegisterRenderProcessMojoServices(
     content::ServiceRegistry* registry) {
   registry->AddService<mojom::BlobChannel>(