BASELINE: Update Chromium to 78.0.3904.130

Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 7 insertions, 14 deletions

diff --git a/chromium/net/base/network_change_notifier_win_unittest.cc b/chromium/net/base/network_change_notifier_win_unittest.cc
index 1f2d4bd5fdd..77cd637727b 100644
--- a/chromium/net/base/network_change_notifier_win_unittest.cc
+++ b/chromium/net/base/network_change_notifier_win_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_change_notifier_factory.h"
-#include "net/test/test_with_scoped_task_environment.h"
+#include "net/test/test_with_task_environment.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -24,13 +24,14 @@ using ::testing::StrictMock;
 
 namespace net {
 
-namespace {
-
 // Subclass of NetworkChangeNotifierWin that overrides functions so that no
-// Windows API networking functions are ever called.
+// Windows API networking function results effect tests.
 class TestNetworkChangeNotifierWin : public NetworkChangeNotifierWin {
  public:
-  TestNetworkChangeNotifierWin() {}
+  TestNetworkChangeNotifierWin() {
+    last_computed_connection_type_ = NetworkChangeNotifier::CONNECTION_UNKNOWN;
+    last_announced_offline_ = false;
+  }
 
   ~TestNetworkChangeNotifierWin() override {
     // This is needed so we don't try to stop watching for IP address changes,
@@ -39,12 +40,6 @@ class TestNetworkChangeNotifierWin : public NetworkChangeNotifierWin {
   }
 
   // From NetworkChangeNotifierWin.
-  NetworkChangeNotifier::ConnectionType RecomputeCurrentConnectionType()
-      const override {
-    return NetworkChangeNotifier::CONNECTION_UNKNOWN;
-  }
-
-  // From NetworkChangeNotifierWin.
   void RecomputeCurrentConnectionTypeOnBlockingSequence(
       base::OnceCallback<void(ConnectionType)> reply_callback) const override {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -80,9 +75,7 @@ bool ExitMessageLoopAndReturnFalse() {
   return false;
 }
 
-}  // namespace
-
-class NetworkChangeNotifierWinTest : public TestWithScopedTaskEnvironment {
+class NetworkChangeNotifierWinTest : public TestWithTaskEnvironment {
  public:
   // Calls WatchForAddressChange, and simulates a WatchForAddressChangeInternal
   // success.  Expects that |network_change_notifier_| has just been created, so