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

chrome/browser/sessions/better_session_restore_browsertest.cc

Index: chrome/browser/sessions/better_session_restore_browsertest.cc
diff --git a/chrome/browser/sessions/better_session_restore_browsertest.cc b/chrome/browser/sessions/better_session_restore_browsertest.cc
index d50a258d3317900482c0fd0c6d5be7a905b329a1..79dc43f632c56ba3f1a2350700dc7162c4efa482 100644
--- a/chrome/browser/sessions/better_session_restore_browsertest.cc
+++ b/chrome/browser/sessions/better_session_restore_browsertest.cc
@@ -579,13 +579,16 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest,
   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();
@@ -658,6 +661,7 @@ 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.