Fix double session-restore bug.

chrome/browser/ui/startup/startup_browser_creator_impl_unittest.cc

 // Copyright 2016 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/ui/startup/startup_browser_creator_impl.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/ui/startup/startup_tab_provider.h"
 #include "chrome/common/url_constants.cc"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 235 matching lines @@
   EXPECT_EQ(Creator::BrowserOpenBehavior::NEW, output);
 }
 
 TEST(StartupBrowserCreatorImplTest, DetermineBrowserOpenBehavior_PostCrash) {
   SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
 
   // Launching after crash should block session restore.
   Creator::BrowserOpenBehavior output = Creator::DetermineBrowserOpenBehavior(
       pref_last, Creator::PROCESS_STARTUP | Creator::IS_POST_CRASH_LAUNCH);
   EXPECT_EQ(Creator::BrowserOpenBehavior::NEW, output);
-
-  // Exception: this can be overridden by passing a switch.
-  output = Creator::DetermineBrowserOpenBehavior(
-      pref_last, Creator::PROCESS_STARTUP | Creator::IS_POST_CRASH_LAUNCH |
-                     Creator::HAS_RESTORE_SWITCH);
-  EXPECT_EQ(Creator::BrowserOpenBehavior::SYNCHRONOUS_RESTORE, output);
 }
 
 TEST(StartupBrowserCreatorImplTest, DetermineBrowserOpenBehavior_NotStartup) {
   SessionStartupPref pref_default(SessionStartupPref::Type::DEFAULT);
   SessionStartupPref pref_last(SessionStartupPref::Type::LAST);
   SessionStartupPref pref_urls(SessionStartupPref::Type::URLS);
 
   // Launch after startup without command-line tabs should always create a new
   // window.
   Creator::BrowserOpenBehavior output =
       Creator::DetermineBrowserOpenBehavior(pref_default, 0);
   EXPECT_EQ(Creator::BrowserOpenBehavior::NEW, output);
 
   output = Creator::DetermineBrowserOpenBehavior(pref_last, 0);
   EXPECT_EQ(Creator::BrowserOpenBehavior::NEW, output);
 
   output = Creator::DetermineBrowserOpenBehavior(pref_urls, 0);
   EXPECT_EQ(Creator::BrowserOpenBehavior::NEW, output);
 }