Restart to regular mode upon restart invocation from OTR profiles.

If the user started the browser in incognito mode and
triggered a restart in regular mode, the browser was started
in the incognito mode.

The restart now always brings back a regular mode.

Bug: 999085
Change-Id: Ib05ff1830371995e8814a87dbbadd2cc86b40e77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1833973
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714241}

chrome/browser/lifetime/application_lifetime_browsertest.cc

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/lifetime/application_lifetime.h"
+
+#include "base/command_line.h"
+#include "base/test/mock_callback.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_browser_main.h"
+#include "chrome/browser/chrome_browser_main_extra_parts.h"
+#include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/test/test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+// A gMock matcher that is satisfied when its argument is a command line
+// containing a given switch.
+MATCHER_P(HasSwitch, switch_name, "") {
+  return arg.HasSwitch(switch_name);
+}
+
+}  // namespace
+
+/**
+ * Test Fixture for testing chrome::AttemptRestart method.
+ *
+ * The SetupCommandLine method takes care of initiating the browser with the
+ * incognito or guest switch. This switch is accessed via GetParam() method and
+ * the switches are passed during the testcase declaration which invokes the
+ * same test once per switch.
+ *
+ * The SetUpInProcessBrowserTestFixture method, creates a mock callback which
+ * gets hooked when chrome tries to Relaunch the browser. The hooking is thanks
+ * to the upgrade_util::ScopedRelaunchChromeBrowserOverride. Our mock callback
+ * runs the MATCHER_P.
+ *
+ * It is template parameterized on the type of switches::kIncognito and
+ * switches::kGuest which is const char*
+ */
+class AttemptRestartTest : public InProcessBrowserTest,
+                           public testing::WithParamInterface<const char*> {
+ protected:
+  AttemptRestartTest() = default;
+
+  // InProcessBrowserTest:
+  void SetUpCommandLine(base::CommandLine* command_line) override {
+    command_line->AppendSwitch(GetParam());
+  }
+
+  void SetUpInProcessBrowserTestFixture() override {
+    // Expect a browser relaunch late in browser shutdown.
+    mock_relaunch_callback_ = std::make_unique<::testing::StrictMock<
+        base::MockCallback<upgrade_util::RelaunchChromeBrowserCallback>>>();
+    EXPECT_CALL(*mock_relaunch_callback_,
+                Run(testing::Not(HasSwitch(GetParam()))));
+    relaunch_chrome_override_ =
+        std::make_unique<upgrade_util::ScopedRelaunchChromeBrowserOverride>(
+            mock_relaunch_callback_->Get());
+  }
+
+ private:
+  std::unique_ptr<
+      base::MockCallback<upgrade_util::RelaunchChromeBrowserCallback>>
+      mock_relaunch_callback_;
+  std::unique_ptr<upgrade_util::ScopedRelaunchChromeBrowserOverride>
+      relaunch_chrome_override_;
+};
+
+INSTANTIATE_TEST_CASE_P(,
+                        AttemptRestartTest,
+                        testing::Values(switches::kIncognito,
+                                        switches::kGuest));
+
+IN_PROC_BROWSER_TEST_P(AttemptRestartTest, AttemptRestartWithOTRProfiles) {
+  // We will now attempt restart, prior to (crbug.com/999085)
+  // the new session after restart defaulted to the browser type
+  // of the last session. Now, we will restart always to regular mode.
+  chrome::AttemptRestart();
+}

chrome/browser/lifetime/switch_utils.cc

@@ -26,6 +26,8 @@ constexpr const char* kSwitchesToRemoveOnAutorestart[] = {
     switches::kApp,
     switches::kAppId,
     switches::kForceFirstRun,
+    switches::kGuest,
+    switches::kIncognito,
     switches::kMakeDefaultBrowser,
     switches::kNoStartupWindow,
     switches::kRestoreLastSession,

chrome/test/BUILD.gn

@@ -1497,6 +1497,7 @@ if (!is_android) {
     if (!is_android && !is_chromeos) {
       sources += [
         "../browser/external_protocol/external_protocol_handler_browsertest.cc",
+        "../browser/lifetime/application_lifetime_browsertest.cc",
       ]
     }