Chromium Code Reviews| 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 d1bb334903ba95b6a4d243cb9599693eefcc4b55..7af994fa80207c2aedc12030798f289aa3da04eb 100644 |
| --- a/chrome/browser/sessions/better_session_restore_browsertest.cc |
| +++ b/chrome/browser/sessions/better_session_restore_browsertest.cc |
| @@ -13,7 +13,6 @@ |
| #include "base/macros.h" |
| #include "base/path_service.h" |
| #include "base/strings/utf_string_conversions.h" |
| -#include "base/test/scoped_feature_list.h" |
| #include "build/build_config.h" |
| #include "chrome/browser/background/background_mode_manager.h" |
| #include "chrome/browser/browser_process.h" |
| @@ -36,8 +35,6 @@ |
| #include "chrome/browser/ui/startup/startup_browser_creator.h" |
| #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| #include "chrome/browser/ui/webui/md_history_ui.h" |
| -#include "chrome/common/chrome_features.h" |
| -#include "chrome/common/chrome_switches.h" |
| #include "chrome/common/pref_names.h" |
| #include "chrome/common/url_constants.h" |
| #include "chrome/test/base/in_process_browser_test.h" |
| @@ -500,48 +497,6 @@ IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, SessionCookiesBrowserClose) { |
| CheckReloadedPageRestored(new_browser); |
| } |
| -// Test that switching MD History on behaves correctly with session restore. |
|
sky
2017/04/27 22:41:04
Is there already a test that ensures the old histo
Dan Beam
2017/04/28 03:17:45
I assume the main entry point to history is Chrome
sky
2017/04/28 17:43:54
I was specifically thinking of an old URL entering
Dan Beam
2017/04/29 02:39:43
it's possible in some cases, so i restored some le
|
| -IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, MDHistoryUpgrade) { |
| - MdHistoryUI::use_test_title_ = true; |
| - Browser* current_browser = browser(); |
| - { |
| - base::test::ScopedFeatureList feature_list; |
| - feature_list.InitAndDisableFeature(features::kMaterialDesignHistory); |
| - content::WebContents* web_contents = |
| - current_browser->tab_strip_model()->GetActiveWebContents(); |
| - content::TitleWatcher title_watcher(web_contents, |
| - base::ASCIIToUTF16("History")); |
| - ui_test_utils::NavigateToURL(current_browser, GURL("chrome://history")); |
| - base::string16 final_title = title_watcher.WaitAndGetTitle(); |
| - EXPECT_EQ(3u, current_browser->tab_strip_model() |
| - ->GetActiveWebContents() |
| - ->GetAllFrames() |
| - .size()); |
| - } |
| - { |
| - base::test::ScopedFeatureList feature_list; |
| - feature_list.InitAndEnableFeature(features::kMaterialDesignHistory); |
| - current_browser = QuitBrowserAndRestore(browser(), false); |
| - // The new history page should have loaded. |
| - CheckTitle(current_browser, base::ASCIIToUTF16("MD History")); |
| - EXPECT_EQ(1u, current_browser->tab_strip_model() |
| - ->GetActiveWebContents() |
| - ->GetAllFrames() |
| - .size()); |
| - } |
| - { |
| - base::test::ScopedFeatureList feature_list; |
| - feature_list.InitAndDisableFeature(features::kMaterialDesignHistory); |
| - current_browser = QuitBrowserAndRestore(current_browser, false); |
| - // The old history page should have loaded. |
| - CheckTitle(current_browser, base::ASCIIToUTF16("History")); |
| - EXPECT_EQ(3u, current_browser->tab_strip_model() |
| - ->GetActiveWebContents() |
| - ->GetAllFrames() |
| - .size()); |
| - } |
| -} |
| - |
| // Test that leaving a popup open will not prevent session restore. |
| IN_PROC_BROWSER_TEST_F(ContinueWhereILeftOffTest, |
| SessionCookiesBrowserCloseWithPopupOpen) { |