cc: Allow command line flag to prevent unit test timeouts.

cc/test/layer_tree_test.cc

 // Copyright 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 "cc/test/layer_tree_test.h"
 
+#include "base/command_line.h"
 #include "cc/animation/animation.h"
 #include "cc/animation/animation_registrar.h"
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/timing_function.h"
 #include "cc/base/thread_impl.h"
 #include "cc/input/input_handler.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/animation_test_common.h"
@@ skipping 287 matching lines @@
 };
 
 LayerTreeTest::LayerTreeTest()
     : beginning_(false),
       end_when_begin_returns_(false),
       timed_out_(false),
       scheduled_(false),
       schedule_when_set_visible_true_(false),
       started_(false),
       ended_(false),
+      timeout_seconds_(0),
       impl_thread_(NULL),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   main_thread_weak_ptr_ = weak_factory_.GetWeakPtr();
+
+  // Tests should timeout quickly unless --cc-layer-tree-test-no-timeout was
+  // specified (for running in a debugger).
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch("cc-layer-tree-test-no-timeout"))
+    timeout_seconds_ = 5;
 }
 
 LayerTreeTest::~LayerTreeTest() {}
 
 void LayerTreeTest::EndTest() {
   // For the case where we EndTest during BeginTest(), set a flag to indicate
   // that the test should end the second BeginTest regains control.
   if (beginning_) {
     end_when_begin_returns_ = true;
   } else if (proxy()) {
@@ skipping 193 matching lines @@
     impl_thread_.reset(new base::Thread("LayerTreeTest"));
     ASSERT_TRUE(impl_thread_->Start());
   }
 
   main_ccthread_ = cc::ThreadImpl::CreateForCurrentThread();
 
   InitializeSettings(&settings_);
 
   main_ccthread_->PostTask(
       base::Bind(&LayerTreeTest::DoBeginTest, base::Unretained(this)));
-  timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this)));
-  main_ccthread_->PostDelayedTask(timeout_.callback(),
-                                  base::TimeDelta::FromSeconds(5));
+
+  if (timeout_seconds_) {
+    timeout_.Reset(base::Bind(&LayerTreeTest::Timeout, base::Unretained(this)));
+    main_ccthread_->PostDelayedTask(
+        timeout_.callback(),
+        base::TimeDelta::FromSeconds(timeout_seconds_));
+  }
+
   MessageLoop::current()->Run();
   if (layer_tree_host_ && layer_tree_host_->root_layer())
     layer_tree_host_->root_layer()->SetLayerTreeHost(NULL);
   layer_tree_host_.reset();
 
   timeout_.Cancel();
 
   ASSERT_FALSE(layer_tree_host_.get());
   client_.reset();
   if (timed_out_) {
     FAIL() << "Test timed out";
     return;
   }
   AfterTest();
 }
 
 }  // namespace cc