Change result code for successfully notifying an existing Chrome process

This CL is ensuring the process singleton notified reports
an exit code that triggers an early exit.

The top-level process exit code is not changing, just one used internally by Chrome (see chrome::IsNormalResultCode).

This will early exit in BrowserMain(...)

================ content/browser/browser_main.cc ================
  int exit_code = main_runner->Initialize(std::move(parameters));
  if (exit_code >= 0)                // Will exit here.
    return exit_code;
  exit_code = main_runner->Run();    // Skip this phase.
  main_runner->Shutdown();
=================================================================

The Shutdown(..) call will still be executed since it is called
in the BrowserMainRunnerImpl's destructor.

[email protected]

Bug: 1340599
Change-Id: I063433be71aaefed503cbe559dfe6511e8e55f39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3735155
Commit-Queue: Etienne Bergeron <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Auto-Submit: Etienne Bergeron <[email protected]>
Reviewed-by: Trent Apted <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1035070}

Author: bergeret

apps/DEPS

@@ -20,6 +20,7 @@ specific_include_rules = {
     "+chrome/browser/extensions/test_extension_environment.h",
     "+chrome/browser/profiles/profile_manager.h",
     "+chrome/browser/ui/simple_message_box_internal.h",
+    "+chrome/common/chrome_result_codes.h",
     "+chrome/common/chrome_switches.h",
     "+chrome/test/base/testing_profile.h",
     # Temporary allowed testing include.

apps/load_and_launch_browsertest.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/extensions/load_error_reporter.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/simple_message_box_internal.h"
+#include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test.h"
@@ -82,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
   int exit_code;
   ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_timeout(),
                                              &exit_code));
-  ASSERT_EQ(0, exit_code);
+  ASSERT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code);
 }
 
 // TODO(jackhou): Enable this test once it works on OSX. It currently does not
@@ -124,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
   int exit_code;
   ASSERT_TRUE(process.WaitForExitWithTimeout(TestTimeouts::action_timeout(),
                                              &exit_code));
-  ASSERT_EQ(0, exit_code);
+  ASSERT_EQ(chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED, exit_code);
 }
 
 #endif  // !BUILDFLAG(IS_CHROMEOS_LACROS)

chrome/browser/chrome_browser_main.cc

@@ -1434,15 +1434,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
                          base::UTF16ToWide(l10n_util::GetStringUTF16(
                              IDS_USED_EXISTING_BROWSER)))
                          .c_str());
-
-      // Having a differentiated return type for testing allows for tests to
-      // verify proper handling of some switches. When not testing, stick to
-      // the standard Unix convention of returning zero when things went as
-      // expected.
-      if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kTestType))
-        return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED;
-      return content::RESULT_CODE_NORMAL_EXIT;
+      return chrome::RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED;
 
     case ProcessSingleton::PROFILE_IN_USE:
       return chrome::RESULT_CODE_PROFILE_IN_USE;

chrome/common/chrome_result_codes.cc

@@ -12,7 +12,8 @@ bool IsNormalResultCode(ResultCode code) {
   // translated back to the normal exit code to indicate nothing went wrong
   // here.
   if (code == RESULT_CODE_NORMAL_EXIT_UPGRADE_RELAUNCHED ||
-      code == RESULT_CODE_NORMAL_EXIT_PACK_EXTENSION_SUCCESS) {
+      code == RESULT_CODE_NORMAL_EXIT_PACK_EXTENSION_SUCCESS ||
+      code == RESULT_CODE_NORMAL_EXIT_PROCESS_NOTIFIED) {
     return true;
   }