Native SSID extraction moved to platform code on Android

net/base/network_quality_estimator.cc

 // Copyright 2015 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 "net/base/network_quality_estimator.h"
 
 #include <float.h>
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ skipping 758 matching lines @@
     NetworkQualityEstimator::NetworkID network_id(
         NetworkChangeNotifier::GetConnectionType(), std::string());
 
     switch (network_id.type) {
       case NetworkChangeNotifier::ConnectionType::CONNECTION_UNKNOWN:
       case NetworkChangeNotifier::ConnectionType::CONNECTION_NONE:
       case NetworkChangeNotifier::ConnectionType::CONNECTION_BLUETOOTH:
       case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET:
         break;
       case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI:
-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-    defined(OS_WIN)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
         network_id.id = GetWifiSSID();
+#elif defined(OS_ANDROID)
+        network_id.id = android::GetCurrentWifiConnectionSsid();

[Ryan Sleevi, 2016/01/26 20:22:26]

DESIGN: Given that network_interfaces is already designed in a
platform-abstracted way to avoid these #ifdefs, I would instead recommend the
following approach:

In network_interfaces_linux.cc, guard GetWifiSSID by a

#if !defined(OS_ANDROID)
std::string GetWifiSSID() {
  ...
}
#endif

Then, implement a network_interfaces_android.cc which implements the GetWifiSSID
function, and either calls android::GetCurrentWifiConnectionSsid() or simply
move that implementation logic (the JNI call) into the _android file.

Add the _android file to the .gyp and .gn files, conditionally as appropriate.

This ensures the API semantics of net::GetWifiSSID() remain the same, and also
avoids the inconsistent naming being introduced here (SSID vs Ssid)

[Ryan Hamilton, 2016/01/26 20:24:48]

Oo! Good idea.

[ripp, 2016/01/27 12:09:06]

Done.

[ripp, 2016/01/27 12:09:06]

Done.

 #endif
         break;
       case NetworkChangeNotifier::ConnectionType::CONNECTION_2G:
       case NetworkChangeNotifier::ConnectionType::CONNECTION_3G:
       case NetworkChangeNotifier::ConnectionType::CONNECTION_4G:
 #if defined(OS_ANDROID)
         network_id.id = android::GetTelephonyNetworkOperator();
 #endif
         break;
       default:
@@ skipping 211 matching lines @@
 
 NetworkQualityEstimator::NetworkQuality&
     NetworkQualityEstimator::NetworkQuality::
     operator=(const NetworkQuality& other) {
   rtt_ = other.rtt_;
   downstream_throughput_kbps_ = other.downstream_throughput_kbps_;
   return *this;
 }
 
 }  // namespace net