Add support for cellular geolocation

chromeos/geolocation/simple_geolocation_request.h

Index: chromeos/geolocation/simple_geolocation_request.h
diff --git a/chromeos/geolocation/simple_geolocation_request.h b/chromeos/geolocation/simple_geolocation_request.h
index dc72c5c52fd1e54c740e44711acf57d976d9dda6..6d19f32f3a59226ffd8de1fabeb340e836048bdf 100644
--- a/chromeos/geolocation/simple_geolocation_request.h
+++ b/chromeos/geolocation/simple_geolocation_request.h
@@ -53,10 +53,12 @@ class CHROMEOS_EXPORT SimpleGeolocationRequest
   // |url| is the server address to which the request wil be sent.
   // |timeout| retry request on error until timeout.
   // If wifi_data is not null, it will be sent to the geolocation server.
+  // If cell_tower_data is not null, it will be sent to the geolocation server.
   SimpleGeolocationRequest(net::URLRequestContextGetter* url_context_getter,
                            const GURL& service_url,
                            base::TimeDelta timeout,
-                           std::unique_ptr<WifiAccessPointVector> wifi_data);
+                           std::unique_ptr<WifiAccessPointVector> wifi_data,
+                           std::unique_ptr<CellTowerVector> cell_tower_data);
 
   ~SimpleGeolocationRequest() override;
 
@@ -132,7 +134,14 @@ class CHROMEOS_EXPORT SimpleGeolocationRequest
   // This is updated on each retry.
   Geoposition position_;
 
+  // Helpers to reformat data into dictionaries for conversion to request JSON
+  std::unique_ptr<base::DictionaryValue> CreateAccessPointDictionary(
+      WifiAccessPoint access_point) const;
+  std::unique_ptr<base::DictionaryValue> CreateCellTowerDictionary(
+      CellTower cell_tower) const;
+
   std::unique_ptr<WifiAccessPointVector> wifi_data_;
+  std::unique_ptr<CellTowerVector> cell_tower_data_;
 
   // Creation and destruction should happen on the same thread.
   base::ThreadChecker thread_checker_;