[content shell] add support for getting tests from the command line.

content/shell/shell_browser_main.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 "content/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_runner_host.h"
 #include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
 namespace {
 
-GURL GetURLForLayoutTest(const char* test_name,
+GURL GetURLForLayoutTest(const std::string& test_name,
                          bool* enable_pixel_dumping,
                          std::string* expected_pixel_hash) {
   // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
   std::string path_or_url = test_name;
   std::string pixel_switch;
   std::string pixel_hash;
   std::string::size_type separator_position = path_or_url.find('\'');
   if (separator_position != std::string::npos) {
     pixel_switch = path_or_url.substr(separator_position + 1);
     path_or_url.erase(separator_position);
@@ skipping 21 matching lines @@
   }
   FilePath local_path;
   if (net::FileURLToFilePath(test_url, &local_path)) {
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     file_util::SetCurrentDirectory(local_path.DirName());
   }
   return test_url;
 }
 
+bool GetNextTest(const CommandLine::StringVector& args, std::string* test) {
+  static size_t pos = 0;

[marja, 2012/10/18 20:53:57]

Uhh, can you make pos an in-out parameter instead.

[jochen (gone - plz use gerrit), 2012/10/18 21:06:42]

Done.

+  if (pos >= args.size())
+    return false;
+  if (args[pos] == FILE_PATH_LITERAL("-"))
+    return std::getline(std::cin, *test, '\n');
+#if defined(OS_WIN)
+  *test = WideToUTF8(args[pos++]);
+#else
+  *test = args[pos++];
+#endif
+  return true;
+}
+
 }  // namespace
 
 // Main routine for running as the Browser process.
 int ShellBrowserMain(const content::MainFunctionParams& parameters) {
   scoped_ptr<content::BrowserMainRunner> main_runner_(
       content::BrowserMainRunner::Create());
 
   int exit_code = main_runner_->Initialize(parameters);
 
   if (exit_code >= 0)
     return exit_code;
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kCheckLayoutTestSysDeps)) {
     return 0;
   }
 
   bool layout_test_mode =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
 
   if (layout_test_mode) {
     content::WebKitTestController test_controller;
+    std::string test_string;
+    CommandLine::StringVector args =
+        CommandLine::ForCurrentProcess()->GetArgs();
 
-    char test_string[2048];
 #if defined(OS_ANDROID)
     std::cout << "#READY\n";
     std::cout.flush();
 #endif
 
-    while (fgets(test_string, sizeof(test_string), stdin)) {
-      char *new_line_position = strchr(test_string, '\n');
-      if (new_line_position)
-        *new_line_position = '\0';
-      if (test_string[0] == '\0')
+    while (GetNextTest(args, &test_string)) {
+      if (test_string.empty())
         continue;
-      if (!strcmp(test_string, "QUIT"))
+      if (test_string == "QUIT")
         break;
 
       bool enable_pixel_dumps;
       std::string pixel_hash;
       GURL test_url = GetURLForLayoutTest(
           test_string, &enable_pixel_dumps, &pixel_hash);
       if (!content::WebKitTestController::Get()->PrepareForLayoutTest(
               test_url, enable_pixel_dumps, pixel_hash)) {
         break;
       }
 
       main_runner_->Run();
 
       if (!content::WebKitTestController::Get()->ResetAfterLayoutTest())
         break;
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }