[content shell] add --no-timeout option

content/shell/layout_test_controller_host.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/layout_test_controller_host.h"
 
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/shell/shell_messages.h"
+#include "content/shell/shell_switches.h"
 #include "webkit/support/webkit_support_gfx.h"
 
 namespace content {
 
 namespace {
 const int kTestTimeoutMilliseconds = 30 * 1000;
 }  // namespace
 
 std::map<RenderViewHost*, LayoutTestControllerHost*>
     LayoutTestControllerHost::controllers_;
@@ skipping 157 matching lines @@
   should_stay_on_page_after_handling_before_unload_ = should_stay_on_page;
 }
 
 void LayoutTestControllerHost::OnDumpChildFramesAsText() {
   dump_child_frames_ = true;
 }
 
 void LayoutTestControllerHost::OnWaitUntilDone() {
   if (wait_until_done_)
     return;
-  watchdog_.Reset(base::Bind(&LayoutTestControllerHost::TimeoutHandler,
-                             base::Unretained(this)));
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      watchdog_.callback(),
-      base::TimeDelta::FromMilliseconds(kTestTimeoutMilliseconds));
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoTimeout)) {
+    watchdog_.Reset(base::Bind(&LayoutTestControllerHost::TimeoutHandler,
+                               base::Unretained(this)));
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE,
+        watchdog_.callback(),
+        base::TimeDelta::FromMilliseconds(kTestTimeoutMilliseconds));
+  }
   wait_until_done_ = true;
 }
 
 void LayoutTestControllerHost::OnNotImplemented(
     const std::string& object_name,
     const std::string& property_name) {
   if (captured_dump_)
     return;
   printf("FAIL: NOT IMPLEMENTED: %s.%s\n",
          object_name.c_str(), property_name.c_str());
   fprintf(stderr, "FAIL: NOT IMPLEMENTED: %s.%s\n",
           object_name.c_str(), property_name.c_str());
   watchdog_.Cancel();
   CaptureDump();
 }
 
 }  // namespace content