Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests

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/logging.h"
 #include "base/memory/scoped_ptr.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 "webkit/support/webkit_support.h"
 
 namespace {
@@ skipping 48 matching lines @@
   }
 
   bool layout_test_mode =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree);
 
   if (layout_test_mode) {
     content::WebKitTestController test_controller;
 
     char test_string[2048];
 #if defined(OS_ANDROID)
-    puts("#READY");
-    fflush(stdout);
+    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')
         continue;
       if (!strcmp(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();
 
-      fflush(stdout);
-      fflush(stderr);
-
       if (!content::WebKitTestController::Get()->ResetAfterLayoutTest())
         break;
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }