MD Settings: fix session restore when the MaterialDesignSettings feature changes across restarts

chrome/browser/sessions/chrome_serialized_navigation_driver.cc

 // Copyright 2017 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/chrome_serialized_navigation_driver.h"
 
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "chrome/common/url_constants.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/public/common/referrer.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/common/content_features.h"
 #include "content/public/common/page_state.h"
 #endif
 
 namespace {
 
 bool IsUberOrUberReplacementURL(const GURL& url) {
   return url.SchemeIs(content::kChromeUIScheme) &&
          (url.host_piece() == chrome::kChromeUIHistoryHost ||
-          url.host_piece() == chrome::kChromeUIUberHost);
+          url.host_piece() == chrome::kChromeUIUberHost ||
+          url.host_piece() == chrome::kChromeUISettingsHost ||
+          url.host_piece() == chrome::kChromeUIHelpHost);
 }
 
 }  // namespace
 
 ChromeSerializedNavigationDriver::~ChromeSerializedNavigationDriver() {}
 
 // static
 ChromeSerializedNavigationDriver*
 ChromeSerializedNavigationDriver::GetInstance() {
   return base::Singleton<
@@ skipping 60 matching lines @@
     // If the android native history UI has been disabled, redirect
     // chrome-native://history to the old web UI.
     navigation->set_virtual_url(GURL(chrome::kChromeUIHistoryURL));
     navigation->set_original_request_url(navigation->virtual_url());
     navigation->set_encoded_page_state(std::string());
   }
 #endif  // defined(OS_ANDROID)
 }
 
 ChromeSerializedNavigationDriver::ChromeSerializedNavigationDriver() {}