Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3817)

Unified Diff: chrome/browser/devtools/device/cast_device_provider.cc

Issue 1534583002: Migrate Local Discovery from net::IPAddressNumber to net::IPAddress. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/devtools/device/cast_device_provider.cc
diff --git a/chrome/browser/devtools/device/cast_device_provider.cc b/chrome/browser/devtools/device/cast_device_provider.cc
index 1e897fe187f0576b9e0f287f71c639830be9ac8a..a029ccdf1cc3a576a86c2bb2b449dbed412da4d7 100644
--- a/chrome/browser/devtools/device/cast_device_provider.cc
+++ b/chrome/browser/devtools/device/cast_device_provider.cc
@@ -13,7 +13,7 @@
#include "base/strings/string_split.h"
#include "base/thread_task_runner_handle.h"
#include "net/base/host_port_pair.h"
-#include "net/base/ip_address_number.h"
+#include "net/base/ip_address.h"
using local_discovery::ServiceDiscoverySharedClient;
@@ -171,14 +171,13 @@ void CastDeviceProvider::OnDeviceChanged(
<< service_description.service_name;
if (service_description.service_type() != kCastServiceType)
return;
- net::IPAddressNumber ip_address = service_description.ip_address;
- if (ip_address.size() != net::kIPv4AddressSize &&
- ip_address.size() != net::kIPv6AddressSize) {
+ net::IPAddress ip_address = service_description.ip_address;
+ if (!ip_address.IsIPv4() && !ip_address.IsIPv6()) {
palmer 2015/12/22 01:09:10 An IsValid (or is_valid) member function might mak
martijnc 2016/01/27 22:50:52 Done.
// An invalid IP address is not queryable.
return;
}
std::string name = service_description.service_name;
- std::string host = net::IPAddressToString(ip_address);
+ std::string host = ip_address.ToString();
service_hostname_map_[name] = host;
device_info_map_[host] = ServiceDescriptionToDeviceInfo(service_description);
}

Powered by Google App Engine
This is Rietveld 408576698