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

Unified Diff: chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

Issue 1412453002: Remove enable-iframe-based-signin flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 5 years, 1 month 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/webui/signin/inline_login_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 6357b36916eb27a97de038c0533639966d2f8efd..5666c58d2e3b50cdf1bbd3db766670f741ac4d2d 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
@@ -302,47 +302,24 @@ void InlineLoginUIBrowserTest::SetAllowedUsernamePattern(
#define MAYBE_DifferentStorageId DifferentStorageId
#endif
IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, MAYBE_DifferentStorageId) {
- if (switches::IsEnableWebviewBasedSignin()) {
- ContentInfo info = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
- CURRENT_TAB);
- WaitUntilUIReady(browser());
-
- // Make sure storage partition of embedded webview is different from
- // parent.
- std::set<content::WebContents*> set;
- GuestViewManager* manager = GuestViewManager::FromBrowserContext(
- info.contents->GetBrowserContext());
- manager->ForEachGuest(info.contents, base::Bind(&AddToSet, &set));
- ASSERT_EQ(1u, set.size());
- content::WebContents* webview_contents = *set.begin();
- content::RenderProcessHost* process =
- webview_contents->GetRenderProcessHost();
- ASSERT_NE(info.pid, process->GetID());
- ASSERT_NE(info.storage_partition, process->GetStoragePartition());
- } else {
- GURL test_url = ui_test_utils::GetTestUrl(
- base::FilePath(base::FilePath::kCurrentDirectory),
- base::FilePath(FILE_PATH_LITERAL("title1.html")));
-
- ContentInfo info1 =
- NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
- ContentInfo info2 = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
- CURRENT_TAB);
- NavigateAndGetInfo(browser(), test_url, CURRENT_TAB);
- ContentInfo info3 = NavigateAndGetInfo(
- browser(),
- signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
- NEW_FOREGROUND_TAB);
-
- // The info for signin should be the same.
- ASSERT_EQ(info2.storage_partition, info3.storage_partition);
- // The info for test_url and signin should be different.
- ASSERT_NE(info1.storage_partition, info2.storage_partition);
- }
+ ContentInfo info = NavigateAndGetInfo(
+ browser(),
+ signin::GetPromoURL(signin_metrics::SOURCE_START_PAGE, false),
+ CURRENT_TAB);
+ WaitUntilUIReady(browser());
+
+ // Make sure storage partition of embedded webview is different from
+ // parent.
+ std::set<content::WebContents*> set;
+ GuestViewManager* manager = GuestViewManager::FromBrowserContext(
+ info.contents->GetBrowserContext());
+ manager->ForEachGuest(info.contents, base::Bind(&AddToSet, &set));
+ ASSERT_EQ(1u, set.size());
+ content::WebContents* webview_contents = *set.begin();
+ content::RenderProcessHost* process =
+ webview_contents->GetRenderProcessHost();
+ ASSERT_NE(info.pid, process->GetID());
+ ASSERT_NE(info.storage_partition, process->GetStoragePartition());
}
IN_PROC_BROWSER_TEST_F(InlineLoginUIBrowserTest, OneProcessLimit) {

Powered by Google App Engine
This is Rietveld 408576698