Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index cf63aa7cf1ec233a8427de64bbba0c5e8ce9d4c0..8a8ccc9131257bfadeae2c54ab1b6ba6ee618521 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -778,8 +778,7 @@ std::string ChromeContentBrowserClient::GetStoragePartitionIdForSite( |
// SiteInstance URL - "chrome-guest://app_id/persist?partition". |
if (site.SchemeIs(content::kGuestScheme)) { |
partition_id = site.spec(); |
- } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL && |
- !switches::IsEnableWebviewBasedSignin()) { |
+ } else if (site.GetOrigin().spec() == kChromeUIChromeSigninURL) { |
// Chrome signin page has an embedded iframe of extension and web content, |
// thus it must be isolated from other webUI pages. |
partition_id = site.GetOrigin().spec(); |
@@ -843,8 +842,7 @@ void ChromeContentBrowserClient::GetStoragePartitionConfigForSite( |
} |
#endif |
- if (!success && (site.GetOrigin().spec() == kChromeUIChromeSigninURL) && |
- !switches::IsEnableWebviewBasedSignin()) { |
+ if (!success && (site.GetOrigin().spec() == kChromeUIChromeSigninURL)) { |
// Chrome signin page has an embedded iframe of extension and web content, |
// thus it must be isolated from other webUI pages. |
*partition_domain = chrome::kChromeUIChromeSigninHost; |
@@ -1442,7 +1440,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
switches::kEnableOutOfProcessPdf, |
switches::kEnablePluginPlaceholderShadowDom, |
switches::kEnableShowModalDialog, |
- switches::kEnableWebBasedSignin, |
switches::kJavaScriptHarmony, |
switches::kMessageLoopHistogrammer, |
switches::kPlaybackMode, |