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

Side by Side 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: fix builders Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/device/cast_device_provider.h" 5 #include "chrome/browser/devtools/device/cast_device_provider.h"
6 6
7 #include "chrome/browser/devtools/device/android_device_manager.h" 7 #include "chrome/browser/devtools/device/android_device_manager.h"
8 #include "net/base/host_port_pair.h" 8 #include "net/base/host_port_pair.h"
9 #include "net/base/ip_address.h"
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 11
11 using local_discovery::ServiceDescription; 12 using local_discovery::ServiceDescription;
12 using DeviceInfo = AndroidDeviceManager::DeviceInfo; 13 using DeviceInfo = AndroidDeviceManager::DeviceInfo;
13 using BrowserInfo = AndroidDeviceManager::BrowserInfo; 14 using BrowserInfo = AndroidDeviceManager::BrowserInfo;
14 15
15 namespace { 16 namespace {
16 17
17 void CompareDeviceInfo(bool* was_run, 18 void CompareDeviceInfo(bool* was_run,
18 const DeviceInfo& expected, 19 const DeviceInfo& expected,
(...skipping 24 matching lines...) Expand all
43 const std::string cast_service_type = "_googlecast._tcp.local"; 44 const std::string cast_service_type = "_googlecast._tcp.local";
44 const std::string cast_service_model = "Fake Cast Device"; 45 const std::string cast_service_model = "Fake Cast Device";
45 46
46 ServiceDescription cast_service; 47 ServiceDescription cast_service;
47 cast_service.service_name = 48 cast_service.service_name =
48 cast_service_display_name + "." + cast_service_type; 49 cast_service_display_name + "." + cast_service_type;
49 cast_service.address = net::HostPortPair("192.168.1.101", 8009); 50 cast_service.address = net::HostPortPair("192.168.1.101", 8009);
50 cast_service.metadata.push_back("id=0123456789abcdef0123456789abcdef"); 51 cast_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
51 cast_service.metadata.push_back("ve=00"); 52 cast_service.metadata.push_back("ve=00");
52 cast_service.metadata.push_back("md=" + cast_service_model); 53 cast_service.metadata.push_back("md=" + cast_service_model);
53 cast_service.ip_address = {192, 168, 1, 101}; 54 ASSERT_TRUE(
55 net::IPAddress::FromIPLiteral("192.168.1.101", &cast_service.ip_address));
54 56
55 device_provider_->OnDeviceChanged(true, cast_service); 57 device_provider_->OnDeviceChanged(true, cast_service);
56 58
57 BrowserInfo exp_browser_info; 59 BrowserInfo exp_browser_info;
58 exp_browser_info.socket_name = "9222"; 60 exp_browser_info.socket_name = "9222";
59 exp_browser_info.display_name = cast_service_display_name; 61 exp_browser_info.display_name = cast_service_display_name;
60 exp_browser_info.type = BrowserInfo::kTypeChrome; 62 exp_browser_info.type = BrowserInfo::kTypeChrome;
61 63
62 DeviceInfo expected; 64 DeviceInfo expected;
63 expected.model = cast_service_model; // From metadata::md 65 expected.model = cast_service_model; // From metadata::md
(...skipping 13 matching lines...) Expand all
77 const std::string other_service_type = "_other._tcp.local"; 79 const std::string other_service_type = "_other._tcp.local";
78 const std::string other_service_model = "Some Other Device"; 80 const std::string other_service_model = "Some Other Device";
79 81
80 ServiceDescription other_service; 82 ServiceDescription other_service;
81 other_service.service_name = 83 other_service.service_name =
82 other_service_display_name + "." + other_service_type; 84 other_service_display_name + "." + other_service_type;
83 other_service.address = net::HostPortPair("10.64.1.101", 1234); 85 other_service.address = net::HostPortPair("10.64.1.101", 1234);
84 other_service.metadata.push_back("id=0123456789abcdef0123456789abcdef"); 86 other_service.metadata.push_back("id=0123456789abcdef0123456789abcdef");
85 other_service.metadata.push_back("ve=00"); 87 other_service.metadata.push_back("ve=00");
86 other_service.metadata.push_back("md=" + other_service_model); 88 other_service.metadata.push_back("md=" + other_service_model);
87 other_service.ip_address = {10, 64, 1, 101}; 89 ASSERT_TRUE(
90 net::IPAddress::FromIPLiteral("10.64.1.101", &other_service.ip_address));
88 91
89 // Callback should not be run, since this service is not yet discovered. 92 // Callback should not be run, since this service is not yet discovered.
90 device_provider_->QueryDeviceInfo(other_service.address.host(), 93 device_provider_->QueryDeviceInfo(other_service.address.host(),
91 base::Bind(&DummyCallback, &was_run)); 94 base::Bind(&DummyCallback, &was_run));
92 ASSERT_FALSE(was_run); 95 ASSERT_FALSE(was_run);
93 96
94 device_provider_->OnDeviceChanged(true, other_service); 97 device_provider_->OnDeviceChanged(true, other_service);
95 98
96 // Callback should not be run, since non-cast services are not discovered by 99 // Callback should not be run, since non-cast services are not discovered by
97 // this device provider. 100 // this device provider.
98 device_provider_->QueryDeviceInfo(other_service.address.host(), 101 device_provider_->QueryDeviceInfo(other_service.address.host(),
99 base::Bind(&DummyCallback, &was_run)); 102 base::Bind(&DummyCallback, &was_run));
100 ASSERT_FALSE(was_run); 103 ASSERT_FALSE(was_run);
101 104
102 // Remove the cast service. 105 // Remove the cast service.
103 device_provider_->OnDeviceRemoved(cast_service.service_name); 106 device_provider_->OnDeviceRemoved(cast_service.service_name);
104 107
105 // Callback should not be run, since the cast service has been removed. 108 // Callback should not be run, since the cast service has been removed.
106 device_provider_->QueryDeviceInfo(cast_service.address.host(), 109 device_provider_->QueryDeviceInfo(cast_service.address.host(),
107 base::Bind(&DummyCallback, &was_run)); 110 base::Bind(&DummyCallback, &was_run));
108 ASSERT_FALSE(was_run); 111 ASSERT_FALSE(was_run);
109 } 112 }
OLDNEW
« no previous file with comments | « chrome/browser/devtools/device/cast_device_provider.cc ('k') | chrome/browser/extensions/api/mdns/dns_sd_device_lister.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698