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

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: fix builders Created 4 years, 11 months 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
« no previous file with comments | « no previous file | chrome/browser/devtools/device/cast_device_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8665ccef151f4166eefd57bd9024ab6fa177fb67..6ad7a5f41f2edfa454c8dfc5b706be305a15ed0d 100644
--- a/chrome/browser/devtools/device/cast_device_provider.cc
+++ b/chrome/browser/devtools/device/cast_device_provider.cc
@@ -14,7 +14,7 @@
#include "base/thread_task_runner_handle.h"
#include "chrome/browser/local_discovery/service_discovery_shared_client.h"
#include "net/base/host_port_pair.h"
-#include "net/base/ip_address_number.h"
+#include "net/base/ip_address.h"
using local_discovery::ServiceDescription;
using local_discovery::ServiceDiscoveryDeviceLister;
@@ -177,14 +177,13 @@ void CastDeviceProvider::OnDeviceChanged(
<< service_description.service_name;
if (service_description.service_type() != kCastServiceType)
return;
- const net::IPAddressNumber& ip_address = service_description.ip_address;
- if (ip_address.size() != net::kIPv4AddressSize &&
- ip_address.size() != net::kIPv6AddressSize) {
+ const net::IPAddress& ip_address = service_description.ip_address;
+ if (!ip_address.IsValid()) {
// An invalid IP address is not queryable.
return;
}
const 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);
}
« no previous file with comments | « no previous file | chrome/browser/devtools/device/cast_device_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698