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

net/dns/mdns_client_unittest.cc

Index: net/dns/mdns_client_unittest.cc
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc
index cb27a0cba9f45391d23521ea1d3da17a7817ee76..3c4b10dd3d99994ef369ec42171d181fef0b09b8 100644
--- a/net/dns/mdns_client_unittest.cc
+++ b/net/dns/mdns_client_unittest.cc
@@ -347,6 +347,7 @@ class MDnsTest : public ::testing::Test {
  public:
   MDnsTest();
   virtual ~MDnsTest();
+  virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
   void DeleteTransaction();
   void DeleteBothListeners();
@@ -393,12 +394,11 @@ MDnsTest::MDnsTest() {
 MDnsTest::~MDnsTest() {
 }
 
-void MDnsTest::TearDown() {
-  base::MessageLoop::current()->RunUntilIdle();
-
-  ASSERT_FALSE(test_client_->IsListeningForTests());
+void MDnsTest::SetUp() {
+  test_client_->StartListening();
+}
 
-  base::MessageLoop::current()->AssertIdle();
+void MDnsTest::TearDown() {
 }
 
 void MDnsTest::SimulatePacketReceive(const char* packet, unsigned size) {
@@ -450,8 +450,6 @@ TEST_F(MDnsTest, PassiveListeners) {
   ASSERT_TRUE(listener_privet->Start());
   ASSERT_TRUE(listener_printer->Start());
 
-  ASSERT_TRUE(test_client_->IsListeningForTests());
-
   // Send the same packet twice to ensure no records are double-counted.
 
   EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
@@ -478,8 +476,6 @@ TEST_F(MDnsTest, PassiveListeners) {
 
   listener_privet.reset();
   listener_printer.reset();
-
-  ASSERT_TRUE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
@@ -493,8 +489,6 @@ TEST_F(MDnsTest, PassiveListenersCacheCleanup) {
 
   ASSERT_TRUE(listener_privet->Start());
 
-  ASSERT_TRUE(test_client_->IsListeningForTests());
-
   EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
       .Times(Exactly(1))
       .WillOnce(Invoke(
@@ -529,8 +523,6 @@ TEST_F(MDnsTest, MalformedPacket) {
 
   ASSERT_TRUE(listener_printer->Start());
 
-  ASSERT_TRUE(test_client_->IsListeningForTests());
-
   EXPECT_CALL(delegate_printer, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
       .Times(Exactly(1))
       .WillOnce(Invoke(
@@ -567,8 +559,6 @@ TEST_F(MDnsTest, TransactionWithEmptyCache) {
 
   ASSERT_TRUE(transaction_privet->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   PtrRecordCopyContainer record_privet;
 
   EXPECT_CALL(*this, MockableRecordCallback(MDnsTransaction::RESULT_RECORD, _))
@@ -596,8 +586,6 @@ TEST_F(MDnsTest, TransactionCacheOnlyNoResult) {
       .Times(Exactly(1));
 
   ASSERT_TRUE(transaction_privet->Start());
-
-  EXPECT_FALSE(test_client_->IsListeningForTests());
 }
 
 TEST_F(MDnsTest, TransactionWithCache) {
@@ -609,8 +597,6 @@ TEST_F(MDnsTest, TransactionWithCache) {
 
   ASSERT_TRUE(listener_irrelevant->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
 
@@ -646,8 +632,6 @@ TEST_F(MDnsTest, AdditionalRecords) {
 
   ASSERT_TRUE(listener_privet->Start());
 
-  ASSERT_TRUE(test_client_->IsListeningForTests());
-
   EXPECT_CALL(delegate_privet, OnRecordUpdate(MDnsListener::RECORD_ADDED, _))
       .Times(Exactly(1))
       .WillOnce(Invoke(
@@ -675,8 +659,6 @@ TEST_F(MDnsTest, TransactionTimeout) {
 
   ASSERT_TRUE(transaction_privet->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   EXPECT_CALL(*this,
               MockableRecordCallback(MDnsTransaction::RESULT_NO_RESULTS, NULL))
       .Times(Exactly(1))
@@ -698,8 +680,6 @@ TEST_F(MDnsTest, TransactionMultipleRecords) {
 
   ASSERT_TRUE(transaction_privet->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   PtrRecordCopyContainer record_privet;
   PtrRecordCopyContainer record_privet2;
 
@@ -738,8 +718,6 @@ TEST_F(MDnsTest, TransactionReentrantDelete) {
 
   ASSERT_TRUE(transaction_->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   EXPECT_CALL(*this, MockableRecordCallback(MDnsTransaction::RESULT_NO_RESULTS,
                                             NULL))
       .Times(Exactly(1))
@@ -758,8 +736,6 @@ TEST_F(MDnsTest, TransactionReentrantDeleteFromCache) {
       &delegate_irrelevant);
   ASSERT_TRUE(listener_irrelevant->Start());
 
-  ASSERT_TRUE(test_client_->IsListeningForTests());
-
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
   transaction_ = test_client_->CreateTransaction(
@@ -808,8 +784,6 @@ TEST_F(MDnsTest, TransactionReentrantCacheLookupStart) {
 
   ASSERT_TRUE(transaction1->Start());
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 }
 
@@ -836,8 +810,6 @@ TEST_F(MDnsTest, ListenerReentrantDelete) {
       .Times(Exactly(1))
       .WillOnce(InvokeWithoutArgs(this, &MDnsTest::DeleteBothListeners));
 
-  EXPECT_TRUE(test_client_->IsListeningForTests());
-
   SimulatePacketReceive(kSamplePacket1, sizeof(kSamplePacket1));
 
   EXPECT_EQ(NULL, listener1_.get());