Add support for cellular geolocation

chromeos/geolocation/simple_geolocation_provider.cc

Index: chromeos/geolocation/simple_geolocation_provider.cc
diff --git a/chromeos/geolocation/simple_geolocation_provider.cc b/chromeos/geolocation/simple_geolocation_provider.cc
index 45d6981dcb8b08bdf1d25cbf8ec6dc848915c429..e6e2445e4d9a3e112e1e981807006fed59190207 100644
--- a/chromeos/geolocation/simple_geolocation_provider.cc
+++ b/chromeos/geolocation/simple_geolocation_provider.cc
@@ -34,6 +34,22 @@ std::unique_ptr<WifiAccessPointVector> GetAccessPointData() {
   return result;
 }
 
+std::unique_ptr<CellTowerVector> GetCellTowerData() {
+  if (!chromeos::NetworkHandler::Get()
+           ->geolocation_handler()
+           ->cellular_enabled()) {
+    return nullptr;
+  }
+
+  std::unique_ptr<CellTowerVector> result(new chromeos::CellTowerVector);

[Ben Chan, 2017/02/02 20:49:24]

auto result = base::MakeUnique<chromeos::CellTowerVector>();

[can Skylar cook, 2017/02/03 00:15:17]

Done.

+  int64_t age_ms = 0;
+  if (!NetworkHandler::Get()->geolocation_handler()->GetCellTowers(result.get(),
+                                                                   &age_ms)) {
+    return nullptr;
+  }
+  return result;
+}
+
 }  // namespace
 
 SimpleGeolocationProvider::SimpleGeolocationProvider(
@@ -49,12 +65,14 @@ SimpleGeolocationProvider::~SimpleGeolocationProvider() {
 void SimpleGeolocationProvider::RequestGeolocation(
     base::TimeDelta timeout,
     bool send_wifi_access_points,
+    bool send_cell_towers,
     SimpleGeolocationRequest::ResponseCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   SimpleGeolocationRequest* request(new SimpleGeolocationRequest(
       url_context_getter_.get(), url_, timeout,
-      send_wifi_access_points ? GetAccessPointData() : nullptr));
+      send_wifi_access_points ? GetAccessPointData() : nullptr,
+      send_cell_towers ? GetCellTowerData() : nullptr));
   requests_.push_back(base::WrapUnique(request));
 
   // SimpleGeolocationProvider owns all requests. It is safe to pass unretained