Add SSID getter to WiFiService.

The SSID is going to be displayed in the captive portal interstitial as such: "The network you are using (Google Guest)..."

BUG=451272

Review URL: https://codereview.chromium.org/880143003

Cr-Commit-Position: refs/heads/master@{#313995}

components/wifi/fake_wifi_service.cc

@@ -189,6 +189,12 @@ void FakeWiFiService::SetEventObservers(
 void FakeWiFiService::RequestConnectedNetworkUpdate() {
 }
 
+void FakeWiFiService::GetConnectedNetworkSSID(std::string* ssid,
+                                              std::string* error) {
+  *ssid = "";
+  *error = "";
+}
+
 NetworkList::iterator FakeWiFiService::FindNetwork(
     const std::string& network_guid) {
   for (NetworkList::iterator it = networks_.begin(); it != networks_.end();

components/wifi/fake_wifi_service.h

@@ -5,6 +5,8 @@
 #ifndef COMPONENTS_WIFI_FAKE_WIFI_SERVICE_H_
 #define COMPONENTS_WIFI_FAKE_WIFI_SERVICE_H_
 
+#include <string>
+
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "components/wifi/network_properties.h"
@@ -54,6 +56,8 @@ class FakeWiFiService : public WiFiService {
       const NetworkGuidListCallback& networks_changed_observer,
       const NetworkGuidListCallback& network_list_changed_observer) override;
   void RequestConnectedNetworkUpdate() override;
+  void GetConnectedNetworkSSID(std::string* ssid,
+                               std::string* error) override;
 
  private:
   NetworkList::iterator FindNetwork(const std::string& network_guid);

components/wifi/wifi_service.h

@@ -118,6 +118,10 @@ class WIFI_EXPORT WiFiService {
   // event on completion.
   virtual void RequestConnectedNetworkUpdate() = 0;
 
+  // Get the SSID of the currently connected network, if any.
+  virtual void GetConnectedNetworkSSID(std::string* ssid,
+                                       std::string* error) = 0;
+
  protected:
   WiFiService() {}
 

components/wifi/wifi_service_mac.mm

@@ -76,6 +76,8 @@ class WiFiServiceMac : public WiFiService {
 
   void RequestConnectedNetworkUpdate() override;
 
+  void GetConnectedNetworkSSID(std::string* ssid, std::string* error) override;
+
  private:
   // Checks |ns_error| and if is not |nil|, then stores |error_name|
   // into |error|.
@@ -416,6 +418,12 @@ void WiFiServiceMac::RequestConnectedNetworkUpdate() {
   OnWlanObserverNotification();
 }
 
+void WiFiServiceMac::GetConnectedNetworkSSID(std::string* ssid,
+                                             std::string* error) {
+  *ssid = base::SysNSStringToUTF8([interface_ ssid]);
+  *error = "";
+}
+
 std::string WiFiServiceMac::GetNetworkConnectionState(
     const std::string& network_guid) const {
   if (network_guid != GUIDFromSSID([interface_ ssid]))

components/wifi/wifi_service_win.cc

@@ -226,6 +226,9 @@ class WiFiServiceImpl : public WiFiService {
 
   virtual void RequestConnectedNetworkUpdate() override {}
 
+  virtual void GetConnectedNetworkSSID(std::string* ssid,
+                                       std::string* error) override;
+
  private:
   typedef int32 EncryptionType;
   enum EncryptionTypeEnum {
@@ -357,6 +360,11 @@ class WiFiServiceImpl : public WiFiService {
   // by interface. Populate |current_properties| on success.
   DWORD GetCurrentProperties(NetworkProperties* current_properties);
 
+  // Get the SSID of the network currently used (connected or in transition)
+  // by interface. Populate |ssid| on success. This is a stripped down version
+  // of GetCurrentProperties that doesn't use the BSS list;
+  DWORD GetCurrentSSID(std::string* ssid);
+
   // Connect to network |network_guid| using previosly stored profile if exists,
   // or just network sid. If |frequency| is not |kFrequencyUnknown| then
   // connects only to BSS which uses that frequency and returns
@@ -806,6 +814,18 @@ void WiFiServiceImpl::SetEventObservers(
   }
 }
 
+void WiFiServiceImpl::GetConnectedNetworkSSID(std::string* ssid,
+                                              std::string* error) {
+  DWORD error_code = EnsureInitialized();
+  if (CheckError(error_code, kErrorWiFiService, error))
+    return;
+  std::string current_ssid;
+  error_code = GetCurrentSSID(&current_ssid);
+  if (CheckError(error_code, kErrorWiFiService, error))
+    return;
+  *ssid = current_ssid;
+}
+
 void WiFiServiceImpl::OnWlanNotificationCallback(
     PWLAN_NOTIFICATION_DATA wlan_notification_data,
     PVOID context) {
@@ -1462,6 +1482,37 @@ DWORD WiFiServiceImpl::GetCurrentProperties(NetworkProperties* properties) {
   return error;
 }
 
+
+DWORD WiFiServiceImpl::GetCurrentSSID(std::string* ssid) {
+  if (client_ == NULL) {
+    NOTREACHED();
+    return ERROR_NOINTERFACE;
+  }
+  DWORD error = ERROR_SUCCESS;
+  DWORD data_size = 0;
+  PWLAN_CONNECTION_ATTRIBUTES wlan_connection_attributes = NULL;
+  error = WlanQueryInterface_function_(
+      client_,
+      &interface_guid_,
+      wlan_intf_opcode_current_connection,
+      NULL,
+      &data_size,
+      reinterpret_cast<PVOID*>(&wlan_connection_attributes),
+      NULL);
+  if (error == ERROR_SUCCESS &&
+      wlan_connection_attributes != NULL) {
+    WLAN_ASSOCIATION_ATTRIBUTES& connected_wlan =
+        wlan_connection_attributes->wlanAssociationAttributes;
+    *ssid = GUIDFromSSID(connected_wlan.dot11Ssid);
+  }
+
+  // Clean up.
+  if (wlan_connection_attributes != NULL)
+    WlanFreeMemory_function_(wlan_connection_attributes);
+
+  return error;
+}
+
 Frequency WiFiServiceImpl::GetFrequencyToConnect(
     const std::string& network_guid) const {
   // Check whether desired frequency is set in |connect_properties_|.

components/wifi/wifi_test.cc

@@ -82,19 +82,20 @@ class WiFiTest {
 
 WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) {
   if (!ParseCommandLine(argc, argv)) {
-    VLOG(0) <<  "Usage: " << argv[0] <<
-                " [--list]"
-                " [--get_key]"
-                " [--get_properties]"
-                " [--create]"
-                " [--connect]"
-                " [--disconnect]"
-                " [--scan]"
-                " [--network_guid=<network_guid>]"
-                " [--frequency=0|2400|5000]"
-                " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]"
-                " [--password=<wifi_password>]"
-                " [<network_guid>]\n";
+    VLOG(0) << "Usage: " << argv[0]
+            << " [--list]"
+               " [--get_connected_ssid]"
+               " [--get_key]"
+               " [--get_properties]"
+               " [--create]"
+               " [--connect]"
+               " [--disconnect]"
+               " [--scan]"
+               " [--network_guid=<network_guid>]"
+               " [--frequency=0|2400|5000]"
+               " [--security=none|WEP-PSK|WPA-PSK|WPA2-PSK]"
+               " [--password=<wifi_password>]"
+               " [<network_guid>]\n";
     return RESULT_WRONG_USAGE;
   }
 
@@ -232,6 +233,17 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) {
     return true;
   }
 
+  if (parsed_command_line.HasSwitch("get_connected_ssid")) {
+    std::string ssid;
+    std::string error;
+    wifi_service_->GetConnectedNetworkSSID(&ssid, &error);
+    if (error.length() > 0)
+      VLOG(0) << error;
+    else
+      VLOG(0) << "Network SSID: " << ssid;
+    return true;
+  }
+
   return false;
 }