[mDns] Make DnsSdRegistry a leaky singleton

chrome/browser/extensions/api/mdns/mdns_apitest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/media/router/discovery/mdns/mock_dns_sd_registry.h"
 #include "chrome/common/extensions/api/mdns.h"
 #include "extensions/common/switches.h"
 #include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 using ::testing::A;
-using DnsSdRegistry = media_router::DnsSdRegistry;
+using media_router::DnsSdRegistry;
 
 namespace api = extensions::api;
 
 namespace {
 
-class MockDnsSdRegistry : public DnsSdRegistry {
- public:
-  explicit MockDnsSdRegistry(extensions::MDnsAPI* api) : api_(api) {}
-  virtual ~MockDnsSdRegistry() {}
-
-  MOCK_METHOD1(AddObserver, void(DnsSdObserver* observer));
-  MOCK_METHOD1(RemoveObserver, void(DnsSdObserver* observer));
-  MOCK_METHOD1(RegisterDnsSdListener, void(const std::string& service_type));
-  MOCK_METHOD1(UnregisterDnsSdListener, void(const std::string& service_type));
-  MOCK_METHOD0(ForceDiscovery, void(void));
-
-  void DispatchMDnsEvent(const std::string& service_type,
-                         const DnsSdServiceList& services) {
-    api_->OnDnsSdEvent(service_type, services);
-  }
-
- private:
-  DnsSdRegistry::DnsSdObserver* api_;
-};
-
 class MDnsAPITest : public ExtensionApiTest {
  public:
   MDnsAPITest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         extensions::switches::kWhitelistedExtensionID,
         "ddchlicdkolnonkihahngkmmmjnjlkkf");
   }
 
   void SetUpTestDnsSdRegistry() {
     extensions::MDnsAPI* api = extensions::MDnsAPI::Get(profile());
-    dns_sd_registry_ = new MockDnsSdRegistry(api);
+    dns_sd_registry_ = base::MakeUnique<media_router::MockDnsSdRegistry>(api);
     EXPECT_CALL(*dns_sd_registry_, AddObserver(api))
         .Times(1);
-    // Transfers ownership of the registry instance.
-    api->SetDnsSdRegistryForTesting(
-        base::WrapUnique<DnsSdRegistry>(dns_sd_registry_));
+    api->SetDnsSdRegistryForTesting(dns_sd_registry_.get());
   }
 
  protected:
-  MockDnsSdRegistry* dns_sd_registry_;
+  std::unique_ptr<media_router::MockDnsSdRegistry> dns_sd_registry_;
 };
 
 }  // namespace
 
 // TODO(justinlin): Win Dbg has a workaround that makes RunExtensionSubtest
 // always return true without actually running the test. Remove when fixed.
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_RegisterListener DISABLED_RegisterListener
 #else
 #define MAYBE_RegisterListener RegisterListener
@@ skipping 130 matching lines @@
 #define MAYBE_MaxServiceInstancesPerEventConst \
   DISABLED_MaxServiceInstancesPerEventConst
 #else
 #define MAYBE_MaxServiceInstancesPerEventConst MaxServiceInstancesPerEventConst
 #endif
 // Test loading extension and registering multiple listeners.
 IN_PROC_BROWSER_TEST_F(MDnsAPITest, MAYBE_MaxServiceInstancesPerEventConst) {
   EXPECT_TRUE(RunExtensionSubtest("mdns/api",
                                   "get_max_service_instances.html"));
 }