Fix some browser tests when running network service in process

This fixes all of content_browsertests and some of the main failures in
browser_tests.

Bug: 908993
Change-Id: Ic77481ef0a5e05110878a9610172863fb9ee6994
Reviewed-on: https://chromium-review.googlesource.com/c/1352411Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611898}

chrome/browser/net/chrome_network_service_restart_browsertest.cc

@@ -44,6 +44,8 @@ class ChromeNetworkServiceRestartBrowserTest : public InProcessBrowserTest {
 // after crash.
 IN_PROC_BROWSER_TEST_F(ChromeNetworkServiceRestartBrowserTest,
                        StoragePartitionGetNetworkContext) {
+  if (content::IsNetworkServiceRunningInProcess())
+    return;
 #if defined(OS_MACOSX)
   // |NetworkServiceTestHelper| doesn't work on browser_tests on macOS.
   return;
@@ -72,6 +74,8 @@ IN_PROC_BROWSER_TEST_F(ChromeNetworkServiceRestartBrowserTest,
 // after crash.
 IN_PROC_BROWSER_TEST_F(ChromeNetworkServiceRestartBrowserTest,
                        SystemNetworkContextManagerGetContext) {
+  if (content::IsNetworkServiceRunningInProcess())
+    return;
 #if defined(OS_MACOSX)
   // |NetworkServiceTestHelper| doesn't work on browser_tests on macOS.
   return;

content/browser/browsing_data/clear_site_data_handler_browsertest.cc

@@ -28,6 +28,7 @@
 #include "content/public/browser/storage_usage_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/network_service_util.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/test/browser_test_utils.h"
@@ -172,7 +173,7 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest {
     if (base::FeatureList::IsEnabled(network::features::kNetworkService))
       is_network_service_enabled_ = true;
 
-    if (is_network_service_enabled_) {
+    if (IsOutOfProcessNetworkService()) {
       // |MockCertVerifier| only seems to work when Network Service was enabled.
       command_line->AppendSwitch(switches::kUseMockCertVerifierForTesting);
     } else {
@@ -191,7 +192,7 @@ class ClearSiteDataHandlerBrowserTest : public ContentBrowserTest {
     // Set up HTTP and HTTPS test servers that handle all hosts.
     host_resolver()->AddRule("*", "127.0.0.1");
 
-    if (is_network_service_enabled_)
+    if (IsOutOfProcessNetworkService())
       SetUpMockCertVerifier(net::OK);
 
     embedded_test_server()->RegisterRequestHandler(

content/browser/frame_host/render_frame_host_impl.cc

@@ -5196,7 +5196,8 @@ void RenderFrameHostImpl::UpdateSubresourceLoaderFactories() {
   // bail out if the frame hasn't commited any yet.
   if (!has_committed_any_navigation_)
     return;
-  DCHECK(network_service_connection_error_handler_holder_.is_bound());
+  DCHECK(!IsOutOfProcessNetworkService() ||
+         network_service_connection_error_handler_holder_.is_bound());
 
   network::mojom::URLLoaderFactoryPtrInfo default_factory_info;
   bool bypass_redirect_checks = false;

content/browser/loader/loader_browsertest.cc

@@ -309,6 +309,12 @@ std::unique_ptr<net::test_server::HttpResponse> CancelOnRequest(
 // URLRequest, which passes the error on ResourceLoader teardown, rather than in
 // response to call to AsyncResourceHandler::OnResponseComplete.
 IN_PROC_BROWSER_TEST_F(LoaderBrowserTest, SyncXMLHttpRequest_Cancelled) {
+  // If network service is running in-process, we can't simulate a crash.
+  if (base::FeatureList::IsEnabled(network::features::kNetworkService) &&
+      IsNetworkServiceRunningInProcess()) {
+    return;
+  }
+
   embedded_test_server()->RegisterRequestHandler(base::Bind(
       &CancelOnRequest, "/hung",
       shell()->web_contents()->GetMainFrame()->GetProcess()->GetID(),

content/browser/webrtc/webrtc_browsertest.cc

@@ -9,6 +9,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/network_service_util.h"
 #include "content/public/common/webrtc_ip_handling_policy.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
@@ -60,7 +61,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CanSetupAudioAndVideoCall) {
 }
 
 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, NetworkProcessCrashRecovery) {
-  if (!base::FeatureList::IsEnabled(network::features::kNetworkService))
+  if (!IsOutOfProcessNetworkService())
     return;
   MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
   SimulateNetworkServiceCrash();