Add an alternative way to specify extra chrome flags via env for testing

chrome/test/automation/proxy_launcher.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 "chrome/test/automation/proxy_launcher.h"
 
 #include "app/sql/connection.h"
+#include "base/environment.h"
 #include "base/file_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/test/test_file_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/automation_constants.h"
@@ skipping 339 matching lines @@
 void ProxyLauncher::PrepareTestCommandline(CommandLine* command_line,
                                            bool include_testing_id) {
   // Propagate commandline settings from test_launcher_utils.
   test_launcher_utils::PrepareBrowserCommandLineForTests(command_line);
 
   // Add any explicit command line flags passed to the process.
   CommandLine::StringType extra_chrome_flags =
       CommandLine::ForCurrentProcess()->GetSwitchValueNative(
           switches::kExtraChromeFlags);
   if (!extra_chrome_flags.empty()) {
-    // Split by spaces and append to command line
+    // Split by spaces and append to command line.
     std::vector<CommandLine::StringType> flags;
-    base::SplitString(extra_chrome_flags, ' ', &flags);
+    base::SplitStringAlongWhitespace(extra_chrome_flags, &flags);
     for (size_t i = 0; i < flags.size(); ++i)
       command_line->AppendArgNative(flags[i]);
   }
 
+  // Also look for extra flags in environment.
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  std::string extra_from_env;
+  if (env->GetVar("EXTRA_CHROME_FLAGS", &extra_from_env)) {
+    std::vector<std::string> flags;
+    base::SplitStringAlongWhitespace(extra_from_env, &flags);
+    for (size_t i = 0; i < flags.size(); ++i)
+      command_line->AppendArg(flags[i]);
+  }
+
   // No default browser check, it would create an info-bar (if we are not the
   // default browser) that could conflicts with some tests expectations.
   command_line->AppendSwitch(switches::kNoDefaultBrowserCheck);
 
   // This is a UI test.
   command_line->AppendSwitchASCII(switches::kTestType, kUITestType);
 
   // Tell the browser to use a temporary directory just for this test.
   command_line->AppendSwitchPath(switches::kUserDataDir, user_data_dir());
 
@@ skipping 203 matching lines @@
   LaunchBrowserAndServer(state, wait_for_initial_loads);
 }
 
 void AnonymousProxyLauncher::TerminateConnection() {
   CloseBrowserAndServer();
 }
 
 std::string AnonymousProxyLauncher::PrefixedChannelID() const {
   return channel_id_;
 }