Fixing problem where a session restore gets performed even though users don't want it

chrome/browser/sessions/better_session_restore_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
@@ skipping 561 matching lines @@
 // Check that form data with a password field is cleared after wrench menu quit.
 IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest,
                        PostWithPasswordCloseAllBrowsers) {
   PostFormWithPage("post_with_password.html", true);
   Browser* new_browser = QuitBrowserAndRestore(browser(), true);
   CheckReloadedPageRestored(new_browser);
   // The form data contained passwords, so it's removed completely.
   CheckFormRestored(new_browser, false, false);
 }
 
+// ChromeOS does not override the SessionStartupPreference upon controlled
+// system restart.
+#if !defined(OS_CHROMEOS)
 class RestartTest : public BetterSessionRestoreTest {
  public:
   RestartTest() { }
   virtual ~RestartTest() { }
  protected:
   void Restart() {
-    // Simluate restarting the browser, but let the test exit peacefully.
+    // Simulate restarting the browser, but let the test exit peacefully.
     for (chrome::BrowserIterator it; !it.done(); it.Next())
       content::BrowserContext::SaveSessionState(it->profile());
     PrefService* pref_service = g_browser_process->local_state();
     pref_service->SetBoolean(prefs::kWasRestarted, true);
 #if defined(OS_WIN)
     if (pref_service->HasPrefPath(prefs::kRelaunchMode))
       pref_service->ClearPref(prefs::kRelaunchMode);
 #endif
   }
 
@@ skipping 52 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(RestartTest, PRE_PostWithPassword) {
   PostFormWithPage("post_with_password.html", true);
   Restart();
 }
 
 IN_PROC_BROWSER_TEST_F(RestartTest, PostWithPassword) {
   // The form data contained passwords, so it's removed completely.
   CheckFormRestored(false, false);
 }
+#endif
 
 // These tests ensure that the Better Session Restore features are not triggered
 // when they shouldn't be.
 class NoSessionRestoreTest : public BetterSessionRestoreTest {
  public:
   NoSessionRestoreTest() { }
 
   virtual void SetUpOnMainThread() override {
     BetterSessionRestoreTest::SetUpOnMainThread();
     SessionStartupPref::SetStartupPref(
@@ skipping 163 matching lines @@
   CookieSettings::Factory::GetForProfile(new_browser->profile())->
       SetDefaultCookieSetting(CONTENT_SETTING_SESSION_ONLY);
   // ... even if background mode is active.
   EnableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
   DisableBackgroundMode();
   new_browser = QuitBrowserAndRestore(new_browser, true);
   StoreDataWithPage(new_browser, "cookies.html");
 }