SimpleGeolocation should support sending WiFi AP data.

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"
 #include "chromeos/geolocation/geoposition.h"
+#include "chromeos/network/geolocation_handler.h"
+#include "chromeos/network/network_handler.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace chromeos {
 
 namespace {
 const char kDefaultGeolocationProviderUrl[] =
     "https://www.googleapis.com/geolocation/v1/geolocate?";
+
+scoped_ptr<WifiAccessPointVector> GetAccessPointData() {
+  scoped_ptr<WifiAccessPointVector> result;
+
+  if (!chromeos::NetworkHandler::Get()->geolocation_handler()->wifi_enabled())
+    return result;
+
+  chromeos::WifiAccessPointVector access_points;

[stevenjb, 2016/03/22 16:39:49]

Rather than allocating this locally and copying the result below, use
scoped_ptr<WAPV>(new WAPV) here and pass the pointer to |result| on success.

[Alexander Alekseev, 2016/03/23 00:04:45]

Done.

+  int64_t age_ms = 0;
+  if (!NetworkHandler::Get()->geolocation_handler()->GetWifiAccessPoints(
+          &access_points, &age_ms)) {
+    return result;
+  }
+  result.reset(new WifiAccessPointVector(access_points));
+  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,
     SimpleGeolocationRequest::ResponseCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  SimpleGeolocationRequest* request(
-      new SimpleGeolocationRequest(url_context_getter_.get(), url_, timeout));
+
+  SimpleGeolocationRequest* request(new SimpleGeolocationRequest(
+      url_context_getter_.get(), url_, timeout,
+      send_wifi_access_points ? GetAccessPointData()
+                              : scoped_ptr<WifiAccessPointVector>()));

[stevenjb, 2016/03/22 16:39:49]

: nullptr

[Alexander Alekseev, 2016/03/23 00:04:45]

Done.

   requests_.push_back(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 18 matching lines @@
   ScopedVector<SimpleGeolocationRequest>::iterator position =
       std::find(requests_.begin(), requests_.end(), request);
   DCHECK(position != requests_.end());
   if (position != requests_.end()) {
     std::swap(*position, *requests_.rbegin());
     requests_.resize(requests_.size() - 1);
   }
 }
 
 }  // namespace chromeos