Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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/component_loader.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 220 matching lines @@
     FilePath filemgr_extension_path(
         command_line->GetSwitchValuePath(switches::kFileManagerExtensionPath));
     Add(IDR_FILEMANAGER_MANIFEST, filemgr_extension_path);
     return;
   }
 #endif  // NDEBUG
   Add(IDR_FILEMANAGER_MANIFEST, FilePath(FILE_PATH_LITERAL("file_manager")));
 #endif  // defined(FILE_MANAGER_EXTENSION)
 }
 
+#if defined(OS_CHROMEOS)
+void ComponentLoader::AddGaiaAuthExtension() {
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
+    FilePath auth_extension_path =
+        command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
+    Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path);
+    return;
+  }
+  Add(IDR_GAIA_AUTH_MANIFEST, FilePath(FILE_PATH_LITERAL("gaia_auth")));
+}
+#endif  // NDEBUG
+
 void ComponentLoader::AddOrReloadEnterpriseWebStore() {
   FilePath path(FILE_PATH_LITERAL("enterprise_web_store"));
 
   // Remove the extension if it was already loaded.
   Remove(path);
 
   std::string enterprise_webstore_url =
       prefs_->GetString(prefs::kEnterpriseWebStoreURL);
 
   // Load the extension only if the URL preference is set.
@@ skipping 21 matching lines @@
         FilePath(FILE_PATH_LITERAL("bookmark_manager")));
 #else
   Add(IDR_BOOKMARKS_MANIFEST, FilePath(FILE_PATH_LITERAL("bookmark_manager")));
 #endif
 
 #if defined(FILE_MANAGER_EXTENSION)
   AddFileManagerExtension();
 #endif
 
 #if defined(OS_CHROMEOS)
-    Add(IDR_MOBILE_MANIFEST,
-        FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
+  Add(IDR_MOBILE_MANIFEST,
+      FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
 
-    Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL(
-        "/usr/share/chromeos-assets/crosh_builtin")));
+  Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL(
+      "/usr/share/chromeos-assets/crosh_builtin")));
 
-    const CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
-      FilePath auth_extension_path =
-          command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
-      Add(IDR_GAIA_TEST_AUTH_MANIFEST, auth_extension_path);
-    } else {
-      Add(IDR_GAIA_AUTH_MANIFEST,
-          FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth")));
-    }
+  AddGaiaAuthExtension();
 
-    // TODO(gauravsh): Only include echo extension on official builds.
-    FilePath echo_extension_path(FILE_PATH_LITERAL(
-        "/usr/share/chromeos-assets/echo"));
-    if (command_line->HasSwitch(switches::kEchoExtensionPath)) {
-      echo_extension_path =
-          command_line->GetSwitchValuePath(switches::kEchoExtensionPath);
-    }
-    Add(IDR_ECHO_MANIFEST, echo_extension_path);
+  // TODO(gauravsh): Only include echo extension on official builds.
+  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  FilePath echo_extension_path(FILE_PATH_LITERAL(
+      "/usr/share/chromeos-assets/echo"));
+  if (command_line->HasSwitch(switches::kEchoExtensionPath)) {
+    echo_extension_path =
+        command_line->GetSwitchValuePath(switches::kEchoExtensionPath);
+  }
+  Add(IDR_ECHO_MANIFEST, echo_extension_path);
 
 #if defined(OFFICIAL_BUILD)
-    if (browser_defaults::enable_help_app) {
-      Add(IDR_HELP_MANIFEST,
-          FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp")));
-    }
+  if (browser_defaults::enable_help_app) {
+    Add(IDR_HELP_MANIFEST,
+        FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/helpapp")));
+  }
 #endif
 #endif  // !defined(OS_CHROMEOS)
 
   Add(IDR_WEBSTORE_MANIFEST, FilePath(FILE_PATH_LITERAL("web_store")));
 
 #if !defined(OS_CHROMEOS)
   // Cloud Print component app. Not required on Chrome OS.
   Add(IDR_CLOUDPRINT_MANIFEST, FilePath(FILE_PATH_LITERAL("cloud_print")));
 #endif
 
@@ skipping 33 matching lines @@
 void ComponentLoader::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreURL,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterStringPref(prefs::kEnterpriseWebStoreName,
                             std::string() /* default_value */,
                             PrefService::UNSYNCABLE_PREF);
 }
 
 }  // namespace extensions