[cleanup] SAML is always enabled.

chrome/browser/extensions/signin/gaia_auth_extension_loader.cc

Index: chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
diff --git a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
index e56d0c522c94303ae0945e7409d5ace8da88dcc5..e5e328bb05d2b99f76d36ba3fe00f386bad15487 100644
--- a/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
+++ b/chrome/browser/extensions/signin/gaia_auth_extension_loader.cc
@@ -52,19 +52,13 @@ void LoadGaiaAuthExtension(BrowserContext* context) {
     return;
   }
 
-#if defined(OS_CHROMEOS)
   int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
+
+#if defined(OS_CHROMEOS)
   if (chromeos::system::InputDeviceSettings::Get()
           ->ForceKeyboardDrivenUINavigation()) {
     manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST;

[bartfab (slow), 2014/07/14 10:12:39]

Did you verify that things do not break when the keyboard manifest is active,
now that the extension host expects SAML to be always enabled?

[dzhioev (left Google), 2014/07/15 18:34:07]

You are right, keyboard manifest was broken. I made it up to date with changes
in main manifest, so now it supports SAML too.

-  } else if (!command_line->HasSwitch(chromeos::switches::kDisableSamlSignin) ||
-             (switches::IsNewProfileManagement() &&
-              context->GetPath() !=
-                  chromeos::ProfileHelper::GetSigninProfileDir())) {
-    manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
   }
-#else
-  int manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
 #endif
 
   component_loader->Add(manifest_resource_id,