Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Unified Diff: chrome/browser/sessions/better_session_restore_browsertest.cc

Issue 2830983005: Remove old webui History page on desktop and mobile (Closed)
Patch Set: axe more android stuff Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
-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) {

Powered by Google App Engine
This is Rietveld 408576698