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

Unified Diff: chrome/browser/devtools/device/cast_device_provider_unittest.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_unittest.cc
diff --git a/chrome/browser/devtools/device/cast_device_provider_unittest.cc b/chrome/browser/devtools/device/cast_device_provider_unittest.cc
index 51b30963eb400c5a361f145d8e7e760a19db6007..cee63d841b4f15cec3740fca59f28b815df2d9fc 100644
--- a/chrome/browser/devtools/device/cast_device_provider_unittest.cc
+++ b/chrome/browser/devtools/device/cast_device_provider_unittest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/devtools/device/android_device_manager.h"
#include "net/base/host_port_pair.h"
+#include "net/base/ip_address.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -49,7 +50,8 @@ TEST(CastDeviceProviderTest, ServiceDiscovery) {
cast_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
cast_service.metadata.push_back("ve=00");
cast_service.metadata.push_back("md=" + cast_service_model);
- cast_service.ip_address = {192, 168, 1, 101};
+ uint8_t address1[4] = {192, 168, 1, 101};
+ cast_service.ip_address = net::IPAddress(address1, sizeof(address1));
eroman 2015/12/21 20:47:33 Or alternately: ASSERT_TRUE(net::IPAddress::FromI
martijnc 2016/01/27 22:50:52 Done.
device_provider_->OnDeviceChanged(true, cast_service);
@@ -83,7 +85,8 @@ TEST(CastDeviceProviderTest, ServiceDiscovery) {
other_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
other_service.metadata.push_back("ve=00");
other_service.metadata.push_back("md=" + other_service_model);
- other_service.ip_address = {10, 64, 1, 101};
+ uint8_t address2[4] = {10, 64, 1, 101};
+ other_service.ip_address = net::IPAddress(address2, sizeof(address2));
// Callback should not be run, since this service is not yet discovered.
device_provider_->QueryDeviceInfo(other_service.address.host(),

Powered by Google App Engine
This is Rietveld 408576698