Add a function to get Wifi SSID to net_util.

net/base/net_util_unittest.cc

Index: net/base/net_util_unittest.cc
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
index e9cd79bced354ff6e47807adf5d93b39a32e1a28..102498807e9be447ed265e01f6b76df45189ef51 100644
--- a/net/base/net_util_unittest.cc
+++ b/net/base/net_util_unittest.cc
@@ -65,6 +65,15 @@ struct HeaderCase {
   const char* const expected;
 };
 
+#if defined(OS_LINUX)
+const char kWiFiSSID[] = "TestWiFi";
+const char kInterfaceWithNoSSID[] = "wlan999";
+
+std::string TestGetInterfaceSSID(const std::string& ifname) {
+  return (ifname == kInterfaceWithNoSSID) ? "" : kWiFiSSID;

[pauljensen, 2015/02/09 12:28:05]

Instead of "", can this return something different from kWiFiSSID?  "" is just
confusing because this is what these functions return if things don't match up.

[meacer, 2015/02/10 04:42:50]

Done.

+}
+#endif
+
 // Fills in sockaddr for the given 32-bit address (IPv4.)
 // |bytes| should be an array of length 4.
 void MakeIPv4Address(const uint8* bytes, int port, SockaddrStorage* storage) {
@@ -1306,6 +1315,49 @@ TEST(NetUtilTest, GetNetworkListTrimming) {
 
 #endif  // !OS_MACOSX && !OS_WIN && !OS_NACL
 
+#if defined(OS_LINUX)
+TEST(NetUtilTest, GetWifiSSID) {
+  NetworkInterfaceList list;
+  EXPECT_EQ(std::string(), net::internal::GetWifiSSIDFromInterfaceListInternal(
+                               list, TestGetInterfaceSSID));
+
+  NetworkInterface interface1;
+  interface1.name = "wlan0";
+  interface1.type = NetworkChangeNotifier::CONNECTION_WIFI;
+  list.push_back(interface1);
+  ASSERT_EQ(1u, list.size());
+  EXPECT_EQ(std::string(kWiFiSSID),
+            net::internal::GetWifiSSIDFromInterfaceListInternal(
+                list, TestGetInterfaceSSID));
+
+  NetworkInterface interface2;
+  interface2.name = "wlan1";
+  interface2.type = NetworkChangeNotifier::CONNECTION_WIFI;
+  list.push_back(interface2);
+  ASSERT_EQ(2u, list.size());
+  EXPECT_EQ(std::string(kWiFiSSID),
+            net::internal::GetWifiSSIDFromInterfaceListInternal(
+                list, TestGetInterfaceSSID));
+
+  NetworkInterface interface3;
+  interface3.name = kInterfaceWithNoSSID;
+  interface3.type = NetworkChangeNotifier::CONNECTION_WIFI;
+  list.push_back(interface3);
+  ASSERT_EQ(3u, list.size());
+  EXPECT_EQ(std::string(), net::internal::GetWifiSSIDFromInterfaceListInternal(
+                               list, TestGetInterfaceSSID));
+
+  list.pop_back();
+  NetworkInterface interface4;
+  interface4.name = "eth0";
+  interface4.type = NetworkChangeNotifier::CONNECTION_ETHERNET;
+  list.push_back(interface4);
+  ASSERT_EQ(3u, list.size());
+  EXPECT_EQ(std::string(), net::internal::GetWifiSSIDFromInterfaceListInternal(
+                               list, TestGetInterfaceSSID));
+}

[pauljensen, 2015/02/09 12:28:05]

Can we add a test for calling net::GetWiFiSSID() to test that it at least
doesn't crash?

[meacer, 2015/02/10 04:42:50]

Renamed the above test and added GetWifiSSID.

+#endif  // OS_LINUX
+
 namespace {
 
 #if defined(OS_WIN)