[cleanup] SAML is always enabled.

chrome/browser/extensions/signin/gaia_auth_extension_loader.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/extensions/signin/gaia_auth_extension_loader.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "extensions/browser/extension_system.h"
 #include "grit/browser_resources.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/file_util.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"

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

Nit: No longer used.

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

Done.

 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_constants.h"
 #include "chromeos/chromeos_switches.h"

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

Nit: No longer used.

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

Done.

 #include "components/signin/core/common/profile_management_switches.h"

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

Nit: No longer used.

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

Done.

 #endif
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 namespace {
 
 extensions::ComponentLoader* GetComponentLoader(BrowserContext* context) {
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(context);
   ExtensionService* extension_service = extension_system->extension_service();
   return extension_service->component_loader();
 }
 
 void LoadGaiaAuthExtension(BrowserContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   extensions::ComponentLoader* component_loader = GetComponentLoader(context);
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
     base::FilePath auth_extension_path =
         command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
     component_loader->Add(IDR_GAIA_AUTH_MANIFEST, auth_extension_path);
     return;
   }
 
+  int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
+
 #if defined(OS_CHROMEOS)
-  int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
   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,
                         base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
 }
 
 void UnloadGaiaAuthExtension(BrowserContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   content::StoragePartition* partition =
@@ skipping 53 matching lines @@
     BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader> > g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<GaiaAuthExtensionLoader>*
 GaiaAuthExtensionLoader::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 } // namespace extensions