Add an explicit way of forcing the MDnsClient to listen on the network

net/dns/mdns_client_impl.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 "net/dns/mdns_client_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/stl_util.h"
 #include "base/time/default_clock.h"
@@ skipping 416 matching lines @@
 }
 
 void MDnsClientImpl::Core::QueryCache(
     uint16 rrtype, const std::string& name,
     std::vector<const RecordParsed*>* records) const {
   cache_.FindDnsRecords(rrtype, name, records, base::Time::Now());
 }
 
 MDnsClientImpl::MDnsClientImpl(
     scoped_ptr<MDnsConnection::SocketFactory> socket_factory)
-    : listen_refs_(0), socket_factory_(socket_factory.Pass()) {
+    : socket_factory_(socket_factory.Pass()) {
 }
 
 MDnsClientImpl::~MDnsClientImpl() {
 }
 
-bool MDnsClientImpl::AddListenRef() {
-  if (!core_.get()) {
-    core_.reset(new Core(this, socket_factory_.get()));
-    if (!core_->Init()) {
-      core_.reset();
-      return false;
-    }
+bool MDnsClientImpl::StartListening() {
+  DCHECK(!core_.get());
+  core_.reset(new Core(this, socket_factory_.get()));
+  if (!core_->Init()) {
+    core_.reset();
+    return false;
   }
-  listen_refs_++;
   return true;
 }
 
-void MDnsClientImpl::SubtractListenRef() {
-  listen_refs_--;
-  if (listen_refs_ == 0) {
-    base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
-        &MDnsClientImpl::Shutdown, base::Unretained(this)));
-  }
+void MDnsClientImpl::StopListening() {
+  core_.reset();
 }
 
-void MDnsClientImpl::Shutdown() {
-  // We need to check that new listeners haven't been created.
-  if (listen_refs_ == 0) {
-    core_.reset();
-  }
-}
-
-bool MDnsClientImpl::IsListeningForTests() {
+bool MDnsClientImpl::IsListening() const {
   return core_.get() != NULL;
 }
 
 scoped_ptr<MDnsListener> MDnsClientImpl::CreateListener(
     uint16 rrtype,
     const std::string& name,
     MDnsListener::Delegate* delegate) {
   return scoped_ptr<net::MDnsListener>(
       new MDnsListenerImpl(rrtype, name, delegate, this));
 }
@@ skipping 12 matching lines @@
     const std::string& name,
     MDnsListener::Delegate* delegate,
     MDnsClientImpl* client)
     : rrtype_(rrtype), name_(name), client_(client), delegate_(delegate),
       started_(false) {
 }
 
 bool MDnsListenerImpl::Start() {
   DCHECK(!started_);
 
-  if (!client_->AddListenRef()) return false;
   started_ = true;
 
   DCHECK(client_->core());
   client_->core()->AddListener(this);
 
   return true;
 }
 
 MDnsListenerImpl::~MDnsListenerImpl() {
   if (started_) {
     DCHECK(client_->core());
     client_->core()->RemoveListener(this);
-    client_->SubtractListenRef();
   }
 }
 
 const std::string& MDnsListenerImpl::GetName() const {
   return name_;
 }
 
 uint16 MDnsListenerImpl::GetType() const {
   return rrtype_;
 }
@@ skipping 151 matching lines @@
 
 void MDnsTransactionImpl::OnNsecRecord(const std::string& name, unsigned type) {
   TriggerCallback(RESULT_NSEC, NULL);
 }
 
 void MDnsTransactionImpl::OnCachePurged() {
   // TODO(noamsml): Cache purge situations not yet implemented
 }
 
 }  // namespace net