Add DiscoveryNetworkMonitor implementation

chrome/browser/media/router/discovery/discovery_network_monitor.cc

Index: chrome/browser/media/router/discovery/discovery_network_monitor.cc
diff --git a/chrome/browser/media/router/discovery/discovery_network_monitor.cc b/chrome/browser/media/router/discovery/discovery_network_monitor.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f907fc1b84e9d6d8cab9ae55f515e462927cfa82
--- /dev/null
+++ b/chrome/browser/media/router/discovery/discovery_network_monitor.cc
@@ -0,0 +1,198 @@
+// Copyright (c) 2017 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 "chrome/browser/media/router/discovery/discovery_network_monitor.h"
+
+#include <iostream>
+
+#include "base/lazy_instance.h"
+#include "base/logging.h"
+#include "base/sha1.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
+#include "chrome/browser/media/router/discovery/discovery_network_list.h"
+#include "net/base/network_interfaces.h"
+
+namespace {
+
+using content::BrowserThread;
+
+const char* kNetworkIdDisconnected = "disconnected";
+const char* kNetworkIdUnknown = "unknown";
+
+std::vector<NetworkInfo> GetNetworkInfo() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  net::NetworkInterfaceList interface_list;
+  if (!net::GetNetworkList(&interface_list,
+                           net::INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES)) {
+    DVLOG(2) << "net::GetNetworkList failed after a network change event";
+    return std::vector<NetworkInfo>();
+  }
+
+  std::vector<NetworkInfo> network_info_list;

[mark a. foltz, 2017/04/18 20:37:00]

Maybe this should be a std::Map<std::string, NetworkInfo> to simplify the code
below?

[btolsch, 2017/04/20 04:03:50]

Done.

+  for (const auto& interface : interface_list) {
+    if (interface.type != net::NetworkChangeNotifier::CONNECTION_ETHERNET &&
+        interface.type != net::NetworkChangeNotifier::CONNECTION_WIFI) {
+      continue;
+    }
+    network_info_list.push_back(
+        NetworkInfo{interface.interface_index, interface.type, interface.name,
+                    std::string(""), interface.address});
+  }
+
+  auto network_ids = GetDiscoveryNetworkIdList();

[mark a. foltz, 2017/04/18 20:37:00]

Or we could have this return results in the same index order as
network_info_list.

[btolsch, 2017/04/20 04:03:50]

The only way to ensure that would be to pass |network_info_list| in and have it
do essentially what we're doing here.  On linux, for example, GetNetworkList
uses netlink sockets and sorts its results by IP but we're using getifaddrs.

+  for (const auto& network_id : network_ids) {
+    auto matching_info_it =
+        std::find_if(begin(network_info_list), end(network_info_list),
+                     [&network_id](const NetworkInfo& network_info) {
+                       return network_info.name == network_id.interface_name;
+                     });
+    if (matching_info_it != end(network_info_list)) {
+      matching_info_it->network_id = network_id.network_id;

[mark a. foltz, 2017/04/18 20:37:00]

What if an entry doesn't have a network_id in |network_ids|?

[btolsch, 2017/04/20 04:03:50]

I think the only option would be to set the network_id in NetworkInfo to either
empty (what happens currently) or maybe to the interface name.  Do you think one
of these is preferable?

+    }
+  }
+  return network_info_list;
+}
+
+base::LazyInstance<DiscoveryNetworkMonitor>::Leaky g_discovery_monitor;
+
+}  // namespace
+NetworkInfo::NetworkInfo() {}
+
+NetworkInfo::NetworkInfo(
+    uint32_t index,
+    net::NetworkChangeNotifier::ConnectionType connection_type,
+    std::string name,
+    std::string network_id,
+    net::IPAddress ip_address)
+    : index(index),
+      connection_type(connection_type),
+      name(name),
+      network_id(network_id),
+      ip_address(ip_address) {}
+
+NetworkInfo::NetworkInfo(const NetworkInfo&) = default;
+
+NetworkInfo& NetworkInfo::operator=(const NetworkInfo&) = default;
+
+bool NetworkInfo::operator==(const NetworkInfo& o) const {
+  return index == o.index && connection_type == o.connection_type &&
+         name == o.name && network_id == o.network_id &&
+         ip_address == o.ip_address;
+}
+
+bool NetworkInfo::operator!=(const NetworkInfo& o) const {
+  return !(*this == o);
+}
+
+DiscoveryNetworkMonitor::DiscoveryNetworkMonitor()
+    : network_id_(kNetworkIdDisconnected),
+      observers_(new base::ObserverListThreadSafe<Observer>(
+          base::ObserverListThreadSafe<
+              Observer>::NotificationType::NOTIFY_EXISTING_ONLY)) {
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+}
+
+DiscoveryNetworkMonitor::~DiscoveryNetworkMonitor() {
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
+}
+
+DiscoveryNetworkMonitor* DiscoveryNetworkMonitor::GetInstance() {
+  DiscoveryNetworkMonitor* monitor = g_discovery_monitor.Pointer();
+  if (!monitor->network_info_callback_) {
+    monitor->network_info_callback_ = base::Bind(&GetNetworkInfo);
+  }
+  return monitor;
+}
+
+DiscoveryNetworkMonitor* DiscoveryNetworkMonitor::GetInstanceForTest(
+    NetworkInfoCallback strategy) {
+  DiscoveryNetworkMonitor* monitor = g_discovery_monitor.Pointer();
+  monitor->network_info_callback_ = std::move(strategy);
+  return monitor;
+}
+
+void DiscoveryNetworkMonitor::RebindNetworkChangeObserverForTest() {
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+}
+
+void DiscoveryNetworkMonitor::AddObserver(Observer* const observer) {
+  observers_->AddObserver(observer);
+}
+
+void DiscoveryNetworkMonitor::RemoveObserver(Observer* const observer) {
+  observers_->RemoveObserver(observer);
+}
+
+void DiscoveryNetworkMonitor::ForceNetworkInfoRefresh(
+    NetworkRefreshCompleteCallback callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&DiscoveryNetworkMonitor::UpdateNetworkInfo,
+                 base::Unretained(this), callback));
+}
+
+void DiscoveryNetworkMonitor::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&DiscoveryNetworkMonitor::UpdateNetworkInfo,
+                 base::Unretained(this), NetworkRefreshCompleteCallback()));
+}
+
+std::string DiscoveryNetworkMonitor::ComputeNetworkId(
+    const std::vector<NetworkInfo>& network_info_list) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  if (network_info_list.size() == 0) {
+    return kNetworkIdDisconnected;
+  }
+  std::string network_ids;
+  for (const auto& network_info : network_info_list) {
+    network_ids += network_info.network_id;
+  }
+  if (network_ids.size() == 0) {
+    return kNetworkIdUnknown;
+  }
+
+  std::vector<std::string> id_list;
+  std::transform(
+      network_info_list.begin(), network_info_list.end(),
+      std::back_inserter(id_list),
+      [](const NetworkInfo& network_info) { return network_info.network_id; });
+  std::sort(id_list.begin(), id_list.end());

[mark a. foltz, 2017/04/18 20:37:00]

Would it be simpler to implement a comparator function over a copy of
network_info_list and them iterate over that, versus extracting and sorting?

[btolsch, 2017/04/20 04:03:50]

I don't think copying and sorting with a comparator would be much simpler than
this.

+  std::string combined_ids;
+  for (const auto& id : id_list) {
+    combined_ids = combined_ids + id;

[mark a. foltz, 2017/04/18 20:37:00]

Nit: You may want to insert a delimeter like ! between ids to prevent aliasing.

[btolsch, 2017/04/20 04:03:50]

Done.

+  }
+
+  std::string hash = base::SHA1HashString(combined_ids);
+  return base::ToLowerASCII(base::HexEncode(hash.data(), hash.length()));
+}
+
+void DiscoveryNetworkMonitor::UpdateNetworkInfo(
+    const NetworkRefreshCompleteCallback& callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  auto network_info_list = network_info_callback_.Run();
+  auto network_id = ComputeNetworkId(network_info_list);
+
+  networks_.swap(network_info_list);
+  network_id_.swap(network_id);
+
+  if (network_id_ != network_id ||

[mark a. foltz, 2017/04/18 20:37:00]

I think only this check is necessary. Because of the stable sorting, if the ids
are a permutation they should generate the same id- that's an invariant we want
for the network_id.

[btolsch, 2017/04/20 04:03:50]

Done.

+      !std::is_permutation(networks_.begin(), networks_.end(),
+                           network_info_list.begin())) {
+    observers_->Notify(FROM_HERE, &Observer::OnNetworksChanged,
+                       base::ConstRef(*this));
+  }
+  if (callback) {
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, callback);
+  }
+}