Elim kRestorePopups

chrome/browser/sessions/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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/process/launch.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 281 matching lines @@
         DISABLED_RestoreOnNewWindowWithNoTabbedBrowsers
 #else
 #define MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers \
         RestoreOnNewWindowWithNoTabbedBrowsers
 #endif
 
 // Makes sure when session restore is triggered in the same process we don't end
 // up with an extra tab.
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
                        MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers) {
-  if (browser_defaults::kRestorePopups)
-    return;
-
   const base::FilePath::CharType* kTitle1File =
       FILE_PATH_LITERAL("title1.html");
   GURL url(ui_test_utils::GetTestUrl(base::FilePath(
       base::FilePath::kCurrentDirectory), base::FilePath(kTitle1File)));
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Turn on session restore.
   SessionStartupPref::SetStartupPref(
       browser()->profile(),
       SessionStartupPref(SessionStartupPref::LAST));
@@ skipping 532 matching lines @@
   navigate_params.disposition = NEW_BACKGROUND_TAB;
   ui_test_utils::NavigateToURL(&navigate_params);
 
   Browser* new_browser = QuitBrowserAndRestore(browser(), 3);
 
   ASSERT_EQ(url1_,
             new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
   ASSERT_EQ(new_browser->tab_strip_model()->active_index(), 1);
 }
 
-// Creates a tabbed browser and popup and makes sure we restore both.
-IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
-  if (!browser_defaults::kRestorePopups)
-    return;  // Test only applicable if restoring popups.
-
-  ui_test_utils::NavigateToURL(browser(), url1_);
-
-  // Make sure we have one window.
-  AssertOneWindowWithOneTab(browser());
-
-  // Open a popup.
-  Browser* popup = new Browser(
-      Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
-                            browser()->host_desktop_type()));
-  popup->window()->Show();
-  ASSERT_EQ(2u, active_browser_list_->size());
-
-  ui_test_utils::NavigateToURL(popup, url1_);
-
-  // Simulate an exit by shuting down the session service. If we don't do this
-  // the first window close is treated as though the user closed the window
-  // and won't be restored.
-  SessionServiceFactory::ShutdownForProfile(browser()->profile());
-
-  // Restart and make sure we have two windows.
-  QuitBrowserAndRestore(browser(), 1);
-
-  ASSERT_EQ(2u, active_browser_list_->size());
-
-  Browser* browser1 = active_browser_list_->get(0);
-  Browser* browser2 = active_browser_list_->get(1);
-
-  Browser::Type type1 = browser1->type();
-  Browser::Type type2 = browser2->type();
-
-  // The order of whether the normal window or popup is first depends upon
-  // activation order, which is not necessarily consistant across runs.
-  if (type1 == Browser::TYPE_TABBED) {
-    EXPECT_EQ(type2, Browser::TYPE_POPUP);
-  } else {
-    EXPECT_EQ(type1, Browser::TYPE_POPUP);
-    EXPECT_EQ(type2, Browser::TYPE_TABBED);
-  }
-}
-
 #if !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
 // This test doesn't apply to the Mac version; see GetCommandLineForRelaunch
 // for details. It was disabled for a long time so might never have worked on
 // ChromeOS.
 
 // Launches an app window, closes tabbed browser, launches and makes sure
 // we restore the tabbed browser url.
 // If this test flakes, use http://crbug.com/29110
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
                        RestoreAfterClosingTabbedBrowserWithAppAndLaunching) {
@@ skipping 270 matching lines @@
   content::NavigationController* controller =
       &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
   EXPECT_TRUE(
       controller->GetDefaultSessionStorageNamespace()->should_persist());
 
   // Quit and restore. Check that no extra tabs were created.
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, active_browser_list_->size());
   EXPECT_EQ(1, new_browser->tab_strip_model()->count());
 }