Extend the GPU watchdog timeout limit to 25 seconds on Mac

The timeout limit for finch will be changed from 60 seconds to 50 seconds

Bug: 949839,1069938
Change-Id: I067009fe71d38fb95a10c13c3267b06355967f95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2146208Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Commit-Queue: Maggie Chen <magchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758642}

gpu/ipc/common/gpu_watchdog_timeout.h

@@ -19,7 +19,7 @@ constexpr base::TimeDelta kGpuWatchdogTimeout =
     base::TimeDelta::FromSeconds(30);
 #elif defined(OS_MACOSX)
 constexpr base::TimeDelta kGpuWatchdogTimeout =
-    base::TimeDelta::FromSeconds(17);
+    base::TimeDelta::FromSeconds(25);
 #elif defined(OS_WIN)
 constexpr base::TimeDelta kGpuWatchdogTimeout =
     base::TimeDelta::FromSeconds(30);

gpu/ipc/service/gpu_watchdog_thread_v2.cc

@@ -111,7 +111,7 @@ std::unique_ptr<GpuWatchdogThreadImplV2> GpuWatchdogThreadImplV2::Create(
     const char kNewTimeOutParam[] = "new_time_out";
     const char kMaxExtraCyclesBeforeKillParam[] =
         "max_extra_cycles_before_kill";
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_MACOSX)
     constexpr int kFinchMaxExtraCyclesBeforeKill = 1;
 #else
     constexpr int kFinchMaxExtraCyclesBeforeKill = 2;