Make sure that the browser will always restore settings page instead of sign out page after user si…

chrome/browser/sessions/session_common_utils.cc

 // Copyright 2014 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/sessions/session_common_utils.h"
 
+#include <algorithm>
+#include <string>
+
 #include "chrome/common/url_constants.h"
+#include "components/sessions/core/session_types.h"
 #include "url/gurl.h"
 
 bool ShouldTrackURLForRestore(const GURL& url) {
   return url.is_valid() &&
          !(url.SchemeIs(content::kChromeUIScheme) &&
            (url.host() == chrome::kChromeUIQuitHost ||
             url.host() == chrome::kChromeUIRestartHost));
 }
+
+int GetSelectedIndexFromTab(const sessions::SessionTab& tab) {
+  int selected_index = tab.current_navigation_index;
+  selected_index = std::max(

[sky, 2016/11/11 00:32:17]

optional: avoid multiple statements and do the assignment at the same time (as
well as making selected_index const).

[zmin, 2016/11/11 22:54:01]

Done.

+      0,
+      std::min(selected_index, static_cast<int>(tab.navigations.size() - 1)));

[sky, 2016/11/11 00:32:17]

DCHECK !tab.navigations.empty() ? I realize the check for empty occurs in
session_restore, but the DCHECK helps document the expectation.

[zmin, 2016/11/11 22:54:01]

Done.

+
+  // After user sign out, Chrome may navigate to the setting page from the
+  // sign out page asynchronously. The browser may be closed before the
+  // navigation callback finished.
+  std::string setting_page_url = std::string(chrome::kChromeUISettingsURL);
+  std::string sign_out_page_url =
+      setting_page_url + std::string(chrome::kSignOutSubPage);
+  if (selected_index > 0 &&
+      tab.navigations[selected_index].virtual_url().spec() ==
+          sign_out_page_url &&
+      tab.navigations[selected_index - 1].virtual_url().spec() ==
+          setting_page_url) {
+    selected_index -= 1;

[sky, 2016/11/11 00:32:17]

optional: I would early return at this point, e.g. return selected_index - 1;

[zmin, 2016/11/11 22:54:01]

Done.

+  }
+
+  return selected_index;
+}