Remove enable-iframe-based-signin flag.

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
@@ skipping 44 matching lines @@
   return true;
 }
 
 content::WebUIDataSource* CreateWebUIDataSource() {
   content::WebUIDataSource* source =
         content::WebUIDataSource::Create(chrome::kChromeUIChromeSigninHost);
   source->OverrideContentSecurityPolicyFrameSrc("frame-src chrome-extension:;");
   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();
   const bool is_running_test = command_line->HasSwitch(::switches::kTestName) ||
                                command_line->HasSwitch(::switches::kTestType);
   if (is_running_test)
     source->SetRequestFilter(base::Bind(&HandleTestFileRequestCallback));
 
   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;
 }
 
 void AddToSetIfIsAuthIframe(std::set<content::RenderFrameHost*>* frame_set,
                             const GURL& parent_origin,
                             const std::string& parent_frame_name,
                             content::RenderFrameHost* frame) {
   content::RenderFrameHost* parent = frame->GetParent();
@@ skipping 40 matching lines @@
 }
 
 InlineLoginUI::~InlineLoginUI() {}
 
 // Gets the Gaia iframe within a WebContents.
 content::RenderFrameHost* InlineLoginUI::GetAuthFrame(
     content::WebContents* web_contents,
     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();
 #endif
   if (is_webview) {
     guest_view::GuestViewManager* manager =
         guest_view::GuestViewManager::FromBrowserContext(
             web_contents->GetBrowserContext());
     if (manager) {
       manager->ForEachGuest(
           web_contents,
           base::Bind(&AddToSetIfSigninWebview, &frame_set, parent_frame_name));
     }
   } else {
     web_contents->ForEachFrame(
         base::Bind(&AddToSetIfIsAuthIframe, &frame_set,
                    parent_origin, parent_frame_name));
   }
   DCHECK_GE(1U, frame_set.size());
   if (!frame_set.empty())
     return *frame_set.begin();
 
   return NULL;
 }