Reland r242290, r241609, r242134.

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 "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/profile_management_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/browser_resources.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_constants.h"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 using content::BrowserThread;
@@ skipping 20 matching lines @@
   }
 
   int manifest_resource_id = IDR_GAIA_AUTH_MANIFEST;
 
 #if defined(OS_CHROMEOS)
   if (chromeos::system::keyboard_settings::ForceKeyboardDrivenUINavigation())
     manifest_resource_id = IDR_GAIA_AUTH_KEYBOARD_MANIFEST;
   else if (command_line->HasSwitch(chromeos::switches::kEnableSamlSignin))
     manifest_resource_id = IDR_GAIA_AUTH_SAML_MANIFEST;
 #else
-  if (switches::IsEnableInlineSignin())
-    manifest_resource_id = IDR_GAIA_AUTH_INLINE_MANIFEST;
+  manifest_resource_id = IDR_GAIA_AUTH_INLINE_MANIFEST;
 #endif
 
   component_loader->Add(manifest_resource_id,
                         base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
 }
 
 void UnloadGaiaAuthExtension(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const char kGaiaAuthId[] = "mfffpogegjflfpflabcdkioaeobkgjik";
@@ skipping 35 matching lines @@
 static base::LazyInstance<ProfileKeyedAPIFactory<GaiaAuthExtensionLoader> >
 g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<GaiaAuthExtensionLoader>*
 GaiaAuthExtensionLoader::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 } // namespace extensions