Remove a race around NetworkChangeNotifier::test_notifications_only_

content/browser/net_info_browsertest.cc

 // Copyright 2014 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/command_line.h"
 #include "base/run_loop.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/network_change_notifier_factory.h"
 
 class NetInfoBrowserTest : public content::ContentBrowserTest {
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     // TODO(jkarlin): Once NetInfo is enabled on all platforms remove this
     // switch.
     command_line->AppendSwitch(switches::kEnableNetworkInformation);
   }
 
+  void SetUp() override {
+    net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
+
 #if defined(OS_CHROMEOS)
-  void SetUp() override {
     // ChromeOS's NetworkChangeNotifier isn't known to content and therefore
     // doesn't get created in content_browsertests. Insert a mock
     // NetworkChangeNotifier.
     net::NetworkChangeNotifier::CreateMock();
+#endif
+
     content::ContentBrowserTest::SetUp();
   }
-#endif
 
   void SetUpOnMainThread() override {
-    net::NetworkChangeNotifier::SetTestNotificationsOnly(true);
     base::RunLoop().RunUntilIdle();
   }
 
   static void SetConnectionType(
       net::NetworkChangeNotifier::ConnectionType type) {
     net::NetworkChangeNotifier::NotifyObserversOfConnectionTypeChangeForTests(
         type);
     base::RunLoop().RunUntilIdle();
   }
 
@@ skipping 26 matching lines @@
 // navigator.isOnline.
 IN_PROC_BROWSER_TEST_F(NetInfoBrowserTest, IsOnline) {
   NavigateToURL(shell(), content::GetTestUrl("", "net_info.html"));
   SetConnectionType(net::NetworkChangeNotifier::CONNECTION_ETHERNET);
   EXPECT_TRUE(RunScriptExtractBool("getOnLine()"));
   SetConnectionType(net::NetworkChangeNotifier::CONNECTION_NONE);
   EXPECT_FALSE(RunScriptExtractBool("getOnLine()"));
   SetConnectionType(net::NetworkChangeNotifier::CONNECTION_WIFI);
   EXPECT_TRUE(RunScriptExtractBool("getOnLine()"));
 }