[Dial] Refactor DialRegistry and DeviceDescriptionFetcher so they can be used by MediaSinkService

chrome/browser/extensions/api/dial/dial_registry_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
 #include "chrome/browser/extensions/api/dial/dial_registry.h"
 #include "chrome/browser/extensions/api/dial/dial_service.h"
@@ skipping 28 matching lines @@
   ~MockDialService() override {}
 
   MOCK_METHOD0(Discover, bool());
   MOCK_METHOD1(AddObserver, void(DialService::Observer*));
   MOCK_METHOD1(RemoveObserver, void(DialService::Observer*));
   MOCK_CONST_METHOD1(HasObserver, bool(const DialService::Observer*));
 };
 
 class MockDialRegistry : public DialRegistry {
  public:
-  MockDialRegistry(Observer* dial_api,
-                   const base::TimeDelta& refresh_interval,
+  MockDialRegistry(const base::TimeDelta& refresh_interval,
                    const base::TimeDelta& expiration,
                    const size_t max_devices)
-      : DialRegistry(dial_api, refresh_interval, expiration, max_devices),
+      : DialRegistry(refresh_interval, expiration, max_devices),
         time_(Time::Now()) {}
 
   ~MockDialRegistry() override {
     // Don't let the DialRegistry delete this.
     DialService* tmp = dial_.release();
     if (tmp)
       CHECK_EQ(&mock_service_, tmp);
   }
 
   // Returns the mock Dial service.
@@ skipping 23 matching lines @@
 };
 
 class DialRegistryTest : public testing::Test {
  public:
   DialRegistryTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
         first_device_("first", GURL("http://127.0.0.1/dd.xml"), Time::Now()),
         second_device_("second", GURL("http://127.0.0.2/dd.xml"), Time::Now()),
         third_device_("third", GURL("http://127.0.0.3/dd.xml"), Time::Now()) {
     registry_ = base::MakeUnique<MockDialRegistry>(
-        &mock_observer_, TimeDelta::FromSeconds(1000),
-        TimeDelta::FromSeconds(10), 10);
+        TimeDelta::FromSeconds(1000), TimeDelta::FromSeconds(10), 10);
+    registry_->RegisterObserver(&mock_observer_);
     list_with_first_device_.push_back(first_device_);
     list_with_second_device_.push_back(second_device_);
   }
 
  protected:
   void SetListenerExpectations() {
     EXPECT_CALL(registry_->mock_service(),
                 AddObserver(A<DialService::Observer*>()));
     EXPECT_CALL(registry_->mock_service(),
                 RemoveObserver(A<DialService::Observer*>()));
@@ skipping 265 matching lines @@
   registry_->OnDiscoveryRequest(nullptr);
   registry_->OnDeviceDiscovered(nullptr, third_device_);
   registry_->OnDiscoveryFinished(nullptr);
 
   registry_->OnListenerRemoved();
 }
 
 }  // namespace dial
 }  // namespace api
 }  // namespace extensions