Do not use the 'original' profile for guest sessions

chrome/browser/ui/settings_window_manager.cc

Index: chrome/browser/ui/settings_window_manager.cc
diff --git a/chrome/browser/ui/settings_window_manager.cc b/chrome/browser/ui/settings_window_manager.cc
index dbe176a49198a66473de282510a3728e48c67ef4..5e4954b8cae94a56c555b510fad6ebe02f7ebb48 100644
--- a/chrome/browser/ui/settings_window_manager.cc
+++ b/chrome/browser/ui/settings_window_manager.cc
@@ -35,8 +35,11 @@ void SettingsWindowManager::RemoveObserver(
 
 void SettingsWindowManager::ShowChromePageForProfile(Profile* profile,
                                                      const GURL& gurl) {
-  // Use the original (non off-the-record) profile for settings.
-  profile = profile->GetOriginalProfile();
+  // Use the original (non off-the-record) profile for settings unless
+  // this is a guest session.
+  if (!profile->IsGuestSession() && profile->IsOffTheRecord())
+    profile = profile->GetOriginalProfile();
+
   // Look for an existing browser window.
   Browser* browser = FindBrowserForProfile(profile);
   if (browser) {