Add a regression test for r632725, which fixes renderer hangs if the network...

Add a regression test for r632725, which fixes renderer hangs if the network process crashes during a cookie request.

Bug: 932305
Change-Id: If809f1e3d5fe2fec9d33daef2d5f627db92952a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1539178Reviewed-by: Min Qin <qinmin@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644508}

content/browser/network_service_browsertest.cc

@@ -424,6 +424,23 @@ IN_PROC_BROWSER_TEST_F(NetworkServiceBrowserTest, SyncXHROnCrash) {
   // If the renderer is hung the test will hang.
 }
 
+// Verifies that sync cookie calls don't hang if the network service crashes.
+IN_PROC_BROWSER_TEST_F(NetworkServiceBrowserTest, SyncCookieGetOnCrash) {
+  if (IsInProcessNetworkService())
+    return;
+
+  network::mojom::NetworkServiceTestPtr network_service_test;
+  ServiceManagerConnection::GetForProcess()->GetConnector()->BindInterface(
+      mojom::kNetworkServiceName, &network_service_test);
+  network_service_test->CrashOnGetCookieList();
+
+  NavigateToURL(shell(), embedded_test_server()->GetURL("/empty.html"));
+
+  ASSERT_TRUE(
+      content::ExecuteScript(shell()->web_contents(), "document.cookie"));
+  // If the renderer is hung the test will hang.
+}
+
 class NetworkServiceInProcessBrowserTest : public ContentBrowserTest {
  public:
   NetworkServiceInProcessBrowserTest() {

content/public/test/network_service_test_helper.cc

@@ -28,6 +28,7 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/test/test_data_directory.h"
+#include "services/network/cookie_manager.h"
 #include "services/network/host_resolver.h"
 #include "services/network/network_context.h"
 #include "services/network/network_service.h"
@@ -183,6 +184,10 @@ class NetworkServiceTestHelper::NetworkServiceTestImpl
         base::BindRepeating(CrashResolveHost, host));
   }
 
+  void CrashOnGetCookieList() override {
+    network::CookieManager::CrashOnGetCookieList();
+  }
+
   void GetLatestMemoryPressureLevel(
       GetLatestMemoryPressureLevelCallback callback) override {
     std::move(callback).Run(latest_memory_pressure_level_);

services/network/cookie_manager.cc

@@ -7,6 +7,8 @@
 #include <utility>
 
 #include "base/bind.h"
+#include "base/process/process.h"
+#include "build/build_config.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
@@ -23,6 +25,12 @@ using CookieDeleteSessionControl = net::CookieDeletionInfo::SessionControl;
 
 namespace network {
 
+namespace {
+
+bool g_crash_on_get_cookie_list = false;
+
+}  // namespace
+
 CookieManager::ListenerRegistration::ListenerRegistration() {}
 
 CookieManager::ListenerRegistration::~ListenerRegistration() {}
@@ -71,6 +79,11 @@ void CookieManager::GetAllCookies(GetAllCookiesCallback callback) {
 void CookieManager::GetCookieList(const GURL& url,
                                   const net::CookieOptions& cookie_options,
                                   GetCookieListCallback callback) {
+#if !defined(OS_IOS)
+  if (g_crash_on_get_cookie_list)
+    base::Process::TerminateCurrentProcessImmediately(1);
+#endif
+
   cookie_store_->GetCookieListWithOptionsAsync(
       url, cookie_options,
       net::cookie_util::IgnoreCookieStatusList(std::move(callback)));
@@ -203,6 +216,10 @@ void CookieManager::BlockThirdPartyCookies(bool block) {
   cookie_settings_.set_block_third_party_cookies(block);
 }
 
+void CookieManager::CrashOnGetCookieList() {
+  g_crash_on_get_cookie_list = true;
+}
+
 CookieDeletionInfo DeletionFilterToInfo(mojom::CookieDeletionFilterPtr filter) {
   CookieDeletionInfo delete_info;
 

services/network/cookie_manager.h

@@ -84,6 +84,9 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) CookieManager
   void SetForceKeepSessionState() override;
   void BlockThirdPartyCookies(bool block) override;
 
+  // Causes the next call to GetCookieList to crash the process.
+  static void CrashOnGetCookieList();
+
  private:
   // State associated with a CookieChangeListener.
   struct ListenerRegistration {

services/network/public/mojom/network_service_test.mojom

@@ -75,6 +75,9 @@ interface NetworkServiceTest {
   // Causes the next host resolve to the given hostname to crash the process.
   CrashOnResolveHost(string host);
 
+  // Causes the next CookieManager::GetCookieList call to crash.
+  CrashOnGetCookieList();
+
   // Gets the latest memory pressure level reported by the
   // MemoryPressureListener.
   [Sync]