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

chrome/browser/sessions/session_restore_browsertest_chromeos.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 <list>
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 
 namespace {
 const char* test_app_popup_name1 = "TestApp1";
 const char* test_app_popup_name2 = "TestApp2";
 }
@@ skipping 33 matching lines @@
     browser->window()->Close();
     observer.Wait();
   }
 
   Browser::CreateParams CreateParamsForApp(const std::string name,
                                            bool trusted) {
     return Browser::CreateParams::CreateForApp(
         name, trusted, gfx::Rect(), profile(), chrome::GetActiveDesktop());
   }
 
-  // Simluate restarting the browser
-  void SetRestart() {
-    PrefService* pref_service = g_browser_process->local_state();
-    pref_service->SetBoolean(prefs::kWasRestarted, true);
+  // Turn on session restore before we restart.
+  void TurnOnSessionRestore() {
+    SessionStartupPref::SetStartupPref(
+        browser()->profile(), SessionStartupPref(SessionStartupPref::LAST));
   }
 
   Profile* profile() { return browser()->profile(); }
 
   std::list<Browser*> browser_list_;
 };
 
 // Thse tests are in pairs. The PRE_ test creates some browser windows and
 // the following test confirms that the correct windows are restored after a
 // restart.
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreBrowserWindows) {
   // One browser window is always created by default.
   EXPECT_TRUE(browser());
   // Create a second normal browser window.
   CreateBrowserWithParams(
       Browser::CreateParams(profile(), chrome::GetActiveDesktop()));
   // Create a third incognito browser window which should not get restored.
   CreateBrowserWithParams(Browser::CreateParams(
       profile()->GetOffTheRecordProfile(), chrome::GetActiveDesktop()));
-  SetRestart();
+  TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreBrowserWindows) {
   size_t total_count = 0;
   size_t incognito_count = 0;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     ++total_count;
     if (it->profile()->IsOffTheRecord())
       ++incognito_count;
   }
   EXPECT_EQ(2u, total_count);
   EXPECT_EQ(0u, incognito_count);
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, PRE_RestoreAppsV1) {
   // Create a trusted app popup.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   // Create a second trusted app with two popup windows.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, true));
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, true));
   // Create a third untrusted (child) app3 popup. This should not get restored.
   CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name2, false));
 
-  SetRestart();
+  TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreAppsV1) {
   size_t total_count = 0;
   size_t app1_count = 0;
   size_t app2_count = 0;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     ++total_count;
     if (it->app_name() == test_app_popup_name1)
       ++app1_count;
@@ skipping 18 matching lines @@
       CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   Browser* app_browser2 =
       CreateBrowserWithParams(CreateParamsForApp(test_app_popup_name1, true));
   app_browser2->window()->Maximize();
 
   EXPECT_FALSE(browser()->window()->IsMaximized());
   EXPECT_TRUE(browser2->window()->IsMaximized());
   EXPECT_FALSE(app_browser1->window()->IsMaximized());
   EXPECT_TRUE(app_browser2->window()->IsMaximized());
 
-  SetRestart();
+  TurnOnSessionRestore();
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTestChromeOS, RestoreMaximized) {
   size_t total_count = 0;
   size_t maximized_count = 0;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     ++total_count;
     if (it->window()->IsMaximized())
       ++maximized_count;
   }
   EXPECT_EQ(4u, total_count);
   EXPECT_EQ(2u, maximized_count);
 }