Remove enable-iframe-based-signin flag.

chrome/browser/ui/webui/signin/inline_login_ui.cc

Index: chrome/browser/ui/webui/signin/inline_login_ui.cc
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc
index 37490232a29b1511621fc342d78aa322333318c7..2045b08020b4d005970ecd3aef3c541d9dd6910c 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -62,9 +62,7 @@ content::WebUIDataSource* CreateWebUIDataSource() {
   source->OverrideContentSecurityPolicyObjectSrc("object-src *;");
   source->SetJsonPath("strings.js");
 
-  bool is_webview_signin_enabled = switches::IsEnableWebviewBasedSignin();
-  source->SetDefaultResource(is_webview_signin_enabled ?
-      IDR_NEW_INLINE_LOGIN_HTML : IDR_INLINE_LOGIN_HTML);
+  source->SetDefaultResource(IDR_NEW_INLINE_LOGIN_HTML);
 
   // Only add a filter when runing as test.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -75,8 +73,7 @@ content::WebUIDataSource* CreateWebUIDataSource() {
 
   source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS);
   source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS);
-  source->AddResourcePath("gaia_auth_host.js", is_webview_signin_enabled ?
-      IDR_GAIA_AUTH_AUTHENTICATOR_JS : IDR_GAIA_AUTH_HOST_JS);
+  source->AddResourcePath("gaia_auth_host.js", IDR_GAIA_AUTH_AUTHENTICATOR_JS);
 
   source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE);
   return source;
@@ -137,9 +134,9 @@ content::RenderFrameHost* InlineLoginUI::GetAuthFrame(
     const GURL& parent_origin,
     const std::string& parent_frame_name) {
   std::set<content::RenderFrameHost*> frame_set;
-  bool is_webview = switches::IsEnableWebviewBasedSignin();
+  bool is_webview = true;
 #if defined(OS_CHROMEOS)
-  is_webview = is_webview || chromeos::StartupUtils::IsWebviewSigninEnabled();
+  is_webview = chromeos::StartupUtils::IsWebviewSigninEnabled();

[achuithb, 2015/12/14 23:00:47]

This is always true now:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/chr...

[Roger Tawa OOO till Jul 10th, 2015/12/15 13:13:44]

Thanks for the tip Achuith.  Fixed.

 #endif
   if (is_webview) {
     guest_view::GuestViewManager* manager =