| Index: chrome/browser/extensions/component_loader.cc
 | 
| diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
 | 
| index 82f4d809ebdbeb94b92ed98fdf28f838e93669cb..e5689bff1f05f1bff461f24a4132d6b266093b06 100644
 | 
| --- a/chrome/browser/extensions/component_loader.cc
 | 
| +++ b/chrome/browser/extensions/component_loader.cc
 | 
| @@ -274,19 +274,6 @@ void ComponentLoader::AddImageLoaderExtension() {
 | 
|  #endif  // defined(IMAGE_LOADER_EXTENSION)
 | 
|  }
 | 
|  
 | 
| -#if defined(OS_CHROMEOS)
 | 
| -void ComponentLoader::AddGaiaAuthExtension() {
 | 
| -  const CommandLine* command_line = CommandLine::ForCurrentProcess();
 | 
| -  if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
 | 
| -    base::FilePath auth_extension_path =
 | 
| -        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
 | 
| -    Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path);
 | 
| -    return;
 | 
| -  }
 | 
| -  Add(IDR_GAIA_AUTH_MANIFEST, base::FilePath(FILE_PATH_LITERAL("gaia_auth")));
 | 
| -}
 | 
| -#endif  // NDEBUG
 | 
| -
 | 
|  void ComponentLoader::AddOrReloadEnterpriseWebStore() {
 | 
|    base::FilePath path(FILE_PATH_LITERAL("enterprise_web_store"));
 | 
|  
 | 
| @@ -346,9 +333,6 @@ void ComponentLoader::AddDefaultComponentExtensions(
 | 
|    Add(IDR_MOBILE_MANIFEST,
 | 
|        base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
 | 
|  
 | 
| -  if (skip_session_components)
 | 
| -    AddGaiaAuthExtension();
 | 
| -
 | 
|  #if defined(OFFICIAL_BUILD)
 | 
|    if (browser_defaults::enable_help_app) {
 | 
|      Add(IDR_HELP_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
 | 
| 
 |