[NetworkChangeNotifier] Run Windows connection type computation on other thread

net/base/network_change_notifier_win_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 "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_change_notifier_factory.h"
 #include "net/base/network_change_notifier_win.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::Return;
 using ::testing::StrictMock;
 
 namespace net {
 
 namespace {
 
-// Subclass of NetworkChangeNotifierWin that overrides functions so that no
-// Windows API networking functions are ever called.
-class TestNetworkChangeNotifierWin : public NetworkChangeNotifierWin {
- public:
-  TestNetworkChangeNotifierWin() {}
-
-  ~TestNetworkChangeNotifierWin() override {
-    // This is needed so we don't try to stop watching for IP address changes,
-    // as we never actually started.
-    set_is_watching(false);
-  }
-
-  // From NetworkChangeNotifierWin.
-  NetworkChangeNotifier::ConnectionType RecomputeCurrentConnectionType()
-      const override {
-    return NetworkChangeNotifier::CONNECTION_UNKNOWN;
-  }
-
-  // From NetworkChangeNotifierWin.
-  MOCK_METHOD0(WatchForAddressChangeInternal, bool());
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestNetworkChangeNotifierWin);
-};
+NetworkChangeNotifier::ConnectionType TestRecomputeCurrentConnectionType() {
+  return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+}
 
 class TestIPAddressObserver : public NetworkChangeNotifier::IPAddressObserver {
  public:
   TestIPAddressObserver() {
     NetworkChangeNotifier::AddIPAddressObserver(this);
   }
 
   ~TestIPAddressObserver() {
     NetworkChangeNotifier::RemoveIPAddressObserver(this);
   }
 
   MOCK_METHOD0(OnIPAddressChanged, void());
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestIPAddressObserver);
 };
 
 bool ExitMessageLoopAndReturnFalse() {
   base::MessageLoop::current()->QuitWhenIdle();
   return false;
 }
 
 }  // namespace
 
+// Subclass of NetworkChangeNotifierWin that overrides functions so that no
+// Windows API networking functions are ever called.
+class TestNetworkChangeNotifierWin : public NetworkChangeNotifierWin {
+ public:
+  TestNetworkChangeNotifierWin() {
+    // Use a mocked connection type callback.
+    calculate_connection_type_ =
+        base::BindRepeating(&TestRecomputeCurrentConnectionType);
+
+    // Use this thread for dns tasks instead of a separate thread.
+    dns_task_runner_ = base::ThreadTaskRunnerHandle::Get();

[pauljensen, 2017/05/23 17:57:40]

why do we care what thread this is run on in tests? we're already spinning the
message loop on line 205, do we need to also spin the DNS loop?

+  }
+
+  ~TestNetworkChangeNotifierWin() override {
+    // This is needed so we don't try to stop watching for IP address changes,
+    // as we never actually started.
+    set_is_watching(false);
+  }
+
+  // From NetworkChangeNotifierWin.
+  MOCK_METHOD0(WatchForAddressChangeInternal, bool());
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestNetworkChangeNotifierWin);
+};
+
 class NetworkChangeNotifierWinTest : public testing::Test {
  public:
   // Calls WatchForAddressChange, and simulates a WatchForAddressChangeInternal
   // success.  Expects that |network_change_notifier_| has just been created, so
   // it's not watching anything yet, and there have been no previous
   // WatchForAddressChangeInternal failures.
   void StartWatchingAndSucceed() {
     EXPECT_FALSE(network_change_notifier_.is_watching());
     EXPECT_EQ(0, network_change_notifier_.sequential_failures());
 
@@ skipping 172 matching lines @@
 }
 
 TEST_F(NetworkChangeNotifierWinTest, NetChangeWinFailSignalTwice) {
   StartWatchingAndSucceed();
   SignalAndFail();
   RetryAndFail();
   RetryAndSucceed();
 }
 
 }  // namespace net