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

Unified Diff: chrome/browser/extensions/api/mdns/mdns_api_unittest.cc

Issue 2876703002: [mDns] Move dns_sd_registry from extension/api/mdns to media/router/discovery/mdns (Closed)
Patch Set: rebase with master Created 3 years, 7 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 | « chrome/browser/extensions/api/mdns/mdns_api.cc ('k') | chrome/browser/extensions/api/mdns/mdns_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
index 490e2eb42a5ef4efc15fad0f45e1d4e664ce38dd..5cb384755f4801b128e5c819b6caac08fdd890bd 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
@@ -91,7 +91,7 @@ base::FilePath bogus_file_pathname(const std::string& name) {
.AppendASCII(name);
}
-class MockDnsSdRegistry : public DnsSdRegistry {
+class MockDnsSdRegistry : public media_router::DnsSdRegistry {
public:
explicit MockDnsSdRegistry(extensions::MDnsAPI* api) : api_(api) {}
virtual ~MockDnsSdRegistry() {}
@@ -109,7 +109,7 @@ class MockDnsSdRegistry : public DnsSdRegistry {
}
private:
- extensions::DnsSdRegistry::DnsSdObserver* api_;
+ media_router::DnsSdRegistry::DnsSdObserver* api_;
};
class MockEventRouter : public EventRouter {
@@ -209,7 +209,8 @@ class MDnsAPITest : public extensions::ExtensionServiceTestBase {
AddObserver(MDnsAPI::Get(browser_context())))
.Times(1);
MDnsAPI::Get(browser_context())
- ->SetDnsSdRegistryForTesting(std::unique_ptr<DnsSdRegistry>(registry_));
+ ->SetDnsSdRegistryForTesting(
+ std::unique_ptr<media_router::DnsSdRegistry>(registry_));
render_process_host_.reset(
new content::MockRenderProcessHost(browser_context()));
@@ -358,9 +359,9 @@ TEST_F(MDnsAPIMaxServicesTest, OnServiceListDoesNotExceedLimit) {
// Dispatch an mDNS event with more service instances than the max, and ensure
// that the list is truncated by inspecting the argument to MockEventRouter's
// BroadcastEvent method.
- DnsSdRegistry::DnsSdServiceList services;
+ media_router::DnsSdRegistry::DnsSdServiceList services;
for (int i = 0; i < api::mdns::MAX_SERVICE_INSTANCES_PER_EVENT + 10; ++i) {
- services.push_back(DnsSdService());
+ services.push_back(media_router::DnsSdService());
}
EXPECT_CALL(
*event_router(),
« no previous file with comments | « chrome/browser/extensions/api/mdns/mdns_api.cc ('k') | chrome/browser/extensions/api/mdns/mdns_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698