Add support for cellular geolocation

chromeos/geolocation/simple_geolocation_provider.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 "chromeos/geolocation/simple_geolocation_provider.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
   std::unique_ptr<WifiAccessPointVector> result(
       new chromeos::WifiAccessPointVector);
   int64_t age_ms = 0;
   if (!NetworkHandler::Get()->geolocation_handler()->GetWifiAccessPoints(
           result.get(), &age_ms)) {
     return nullptr;
   }
   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(
     net::URLRequestContextGetter* url_context_getter,
     const GURL& url)
     : url_context_getter_(url_context_getter), url_(url) {
 }
 
 SimpleGeolocationProvider::~SimpleGeolocationProvider() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 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
   // "this" because destruction of SimpleGeolocationProvider cancels all
   // requests.
   SimpleGeolocationRequest::ResponseCallback callback_tmp(
       base::Bind(&SimpleGeolocationProvider::OnGeolocationResponse,
                  base::Unretained(this),
                  request,
                  callback));
@@ skipping 22 matching lines @@
             return req.get() == request;
           });
   DCHECK(position != requests_.end());
   if (position != requests_.end()) {
     std::swap(*position, *requests_.rbegin());
     requests_.resize(requests_.size() - 1);
   }
 }
 
 }  // namespace chromeos