Removing Windows Restart Manager registration for browser tests

Bug: 747034
Change-Id: I6d7a449c0919b4fe2f0d1c1ed29276131dc4b9b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2380738Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: David Bienvenu <davidbienvenu@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Elaine Chien <elainec@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802743}

chrome/browser/chrome_browser_main.cc

@@ -1459,7 +1459,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   // This could be run as late as WM_QUERYENDSESSION for system update reboots,
   // but should run on startup if extended to handle crashes/hangs/patches.
   // Also, better to run once here than once for each HWND's WM_QUERYENDSESSION.
-  ChromeBrowserMainPartsWin::RegisterApplicationRestart(parsed_command_line());
+  if (!parsed_command_line().HasSwitch(switches::kBrowserTest)) {
+    ChromeBrowserMainPartsWin::RegisterApplicationRestart(
+        parsed_command_line());
+  }
 
   // Verify that the profile is not on a network share and if so prepare to show
   // notification to the user.

chrome/browser/chrome_browser_main_win.cc

@@ -765,10 +765,8 @@ void ChromeBrowserMainPartsWin::RegisterApplicationRestart(
       RESTART_NO_CRASH | RESTART_NO_HANG | RESTART_NO_PATCH);
   if (FAILED(hr)) {
     if (hr == E_INVALIDARG) {
-      if (!parsed_command_line.HasSwitch(switches::kBrowserTest)) {
-        LOG(WARNING) << "Command line too long for RegisterApplicationRestart: "
-                     << command_line_string;
-      }
+      LOG(WARNING) << "Command line too long for RegisterApplicationRestart: "
+                   << command_line_string;
     } else {
       NOTREACHED() << "RegisterApplicationRestart failed. hr: " << hr
                    << ", command_line: " << command_line_string;