cros: Don't load Genius help app in tests

chrome/browser/extensions/component_loader.cc

Index: chrome/browser/extensions/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 219917dc9cc9bb3ca0072c8ab23ab56ba0af61ef..4bf33b1e980b36f1bc1c49eb1d7e49736c8c4084 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -374,15 +374,6 @@ void ComponentLoader::AddDefaultComponentExtensions(
       base::FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));
 
 #if defined(GOOGLE_CHROME_BUILD)
-  {
-    const CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) {
-      AddWithName(IDR_GENIUS_APP_MANIFEST,
-                  base::FilePath(FILE_PATH_LITERAL(
-                      "/usr/share/chromeos-assets/genius_app")),
-                  l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME));
-    }
-  }
   if (browser_defaults::enable_help_app) {
     Add(IDR_HELP_MANIFEST, base::FilePath(FILE_PATH_LITERAL(
                                "/usr/share/chromeos-assets/helpapp")));
@@ -429,6 +420,16 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     return;
   }
 
+#if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
+  // Since this is a v2 app it has a background page.
+  if (!command_line->HasSwitch(chromeos::switches::kDisableGeniusApp)) {
+    AddWithName(IDR_GENIUS_APP_MANIFEST,
+                base::FilePath(FILE_PATH_LITERAL(
+                    "/usr/share/chromeos-assets/genius_app")),
+                l10n_util::GetStringUTF8(IDS_GENIUS_APP_NAME));
+  }
+#endif
+
   if (!skip_session_components) {
     // Apps Debugger
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppsDevtool) &&