Extend --load-extension commandline to accept multiple (comma-separated) extensions.

chrome/browser/extensions/extension_startup_browsertest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "base/string_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 19 matching lines @@
     FilePath profile_dir;
     PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
     profile_dir = profile_dir.AppendASCII("Default");
     file_util::CreateDirectory(profile_dir);
 
     preferences_file_ = profile_dir.AppendASCII("Preferences");
     user_scripts_dir_ = profile_dir.AppendASCII("User Scripts");
     extensions_dir_ = profile_dir.AppendASCII("Extensions");
 
     if (enable_extensions_) {
-      if (load_extension_.empty()) {
+      if (load_extensions_.empty()) {
         FilePath src_dir;
         PathService::Get(chrome::DIR_TEST_DATA, &src_dir);
         src_dir = src_dir.AppendASCII("extensions").AppendASCII("good");
 
         file_util::CopyFile(src_dir.AppendASCII("Preferences"),
                             preferences_file_);
         file_util::CopyDirectory(src_dir.AppendASCII("Extensions"),
                                  profile_dir, true);  // recursive
       }
     } else {
       command_line->AppendSwitch(switches::kDisableExtensions);
     }
 
-    if (!load_extension_.empty()) {
-      command_line->AppendSwitchPath(switches::kLoadExtension, load_extension_);
+    if (!load_extensions_.empty()) {
+      FilePath::StringType paths = JoinString(load_extensions_, ',');
+      command_line->AppendSwitchNative(switches::kLoadExtension,
+                                       paths);
       command_line->AppendSwitch(switches::kDisableExtensionsFileAccessCheck);
     }
   }
 
   virtual void TearDown() {
     EXPECT_TRUE(file_util::Delete(preferences_file_, false));
 
     // TODO(phajdan.jr): Check return values of the functions below, carefully.
     file_util::Delete(user_scripts_dir_, true);
     file_util::Delete(extensions_dir_, true);
@@ skipping 48 matching lines @@
         browser()->GetSelectedTabContents()->render_view_host(), L"",
         L"window.domAutomationController.send(document.title == 'Modified')",
         &result));
     EXPECT_EQ(expect_script, result);
   }
 
   FilePath preferences_file_;
   FilePath extensions_dir_;
   FilePath user_scripts_dir_;
   bool enable_extensions_;
-  FilePath load_extension_;
+  // Extensions to load from the command line.
+  std::vector<FilePath::StringType> load_extensions_;
 
   int num_expected_extensions_;
 };
 
 
 // ExtensionsStartupTest
 // Ensures that we can startup the browser with --enable-extensions and some
 // extensions installed and see them run and do basic things.
 
 class ExtensionsStartupTest : public ExtensionStartupTestBase {
@@ skipping 44 matching lines @@
 }
 
 // ExtensionsLoadTest
 // Ensures that we can startup the browser with --load-extension and see them
 // run.
 
 class ExtensionsLoadTest : public ExtensionStartupTestBase {
  public:
   ExtensionsLoadTest() {
     enable_extensions_ = true;
-    PathService::Get(chrome::DIR_TEST_DATA, &load_extension_);
-    load_extension_ = load_extension_
+    FilePath one_extension_path;
+    PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
+    one_extension_path = one_extension_path
         .AppendASCII("extensions")
         .AppendASCII("good")
         .AppendASCII("Extensions")
         .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
         .AppendASCII("1.0.0.0");
+    load_extensions_.push_back(one_extension_path.value());
   }
 };
 
 // Fails inconsistently on Linux x64. http://crbug.com/80961
 #if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)
 #define Maybe_Test FLAKY_Test
 #else
 #define Maybe_Test Test
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadTest, Maybe_Test) {
   WaitForServicesToStart(1, true);
   TestInjection(true, true);
 }
+
+// ExtensionsLoadMultipleTest
+// Ensures that we can startup the browser with multiple extensions
+// via --load-extension=X1,X2
+

[asargent_no_longer_on_chrome, 2011/12/14 17:52:53]

nit: remove space here

+class ExtensionsLoadMultipleTest : public ExtensionStartupTestBase {
+ public:
+  ExtensionsLoadMultipleTest() {
+    enable_extensions_ = true;
+    FilePath one_extension_path;
+    PathService::Get(chrome::DIR_TEST_DATA, &one_extension_path);
+    one_extension_path = one_extension_path
+        .AppendASCII("extensions")
+        .AppendASCII("good")
+        .AppendASCII("Extensions")
+        .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj")
+        .AppendASCII("1.0.0.0");
+    load_extensions_.push_back(one_extension_path.value());
+
+    FilePath second_extension_path;
+    PathService::Get(chrome::DIR_TEST_DATA, &second_extension_path);
+    second_extension_path = second_extension_path
+        .AppendASCII("extensions")
+        .AppendASCII("app");
+    load_extensions_.push_back(second_extension_path.value());
+
+    FilePath third_extension_path;
+    PathService::Get(chrome::DIR_TEST_DATA, &third_extension_path);
+    third_extension_path = third_extension_path
+        .AppendASCII("extensions")
+        .AppendASCII("app1");
+    load_extensions_.push_back(third_extension_path.value());
+
+    FilePath fourth_extension_path;
+    PathService::Get(chrome::DIR_TEST_DATA, &fourth_extension_path);
+    fourth_extension_path = fourth_extension_path
+        .AppendASCII("extensions")
+        .AppendASCII("app2");
+    load_extensions_.push_back(fourth_extension_path.value());
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) {
+  WaitForServicesToStart(4, true);
+  TestInjection(true, true);
+}