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

Unified Diff: chrome/browser/ui/zoom/zoom_controller_browsertest.cc

Issue 1412453002: Remove enable-iframe-based-signin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use nullptr Created 5 years 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/ui/zoom/zoom_controller_browsertest.cc
diff --git a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
index 68c43c40f549c196c11a572d04d0cfcc9ebe7846..580d11b264750d8b913bb008a6fa9d1bcf1853cf 100644
--- a/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
+++ b/chrome/browser/ui/zoom/zoom_controller_browsertest.cc
@@ -297,9 +297,6 @@ IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
ZoomController* zoom_controller =
ZoomController::FromWebContents(web_contents);
- content::HostZoomMap* host_zoom_map_signin =
- content::HostZoomMap::GetForWebContents(web_contents);
-
GURL settings_url(chrome::kChromeUISettingsURL);
ui_test_utils::NavigateToURL(browser(), settings_url);
EXPECT_NE(
@@ -315,17 +312,6 @@ IN_PROC_BROWSER_TEST_F(ZoomControllerBrowserTest,
EXPECT_EQ(settings_url, web_contents->GetLastCommittedURL());
EXPECT_EQ(zoom_controller, ZoomController::FromWebContents(web_contents));
- // For the webview based sign-in code, the sign in page uses the default host
- // zoom map.
- if (!switches::IsEnableWebviewBasedSignin()) {
- // We expect the navigation from the chrome sign in page to the settings
- // page to invoke a storage partition switch, and thus a different
- // HostZoomMap for the web_contents.
- content::HostZoomMap* host_zoom_map_settings =
- content::HostZoomMap::GetForWebContents(web_contents);
- EXPECT_NE(host_zoom_map_signin, host_zoom_map_settings);
- }
-
// If we zoom the new page, it should still generate a ZoomController event.
double old_zoom_level = zoom_controller->GetZoomLevel();
double new_zoom_level = old_zoom_level + 0.5;

Powered by Google App Engine
This is Rietveld 408576698