Revert 63388 - http://build.chromium.org/buildbot/waterfall/builders/Mac10.6%20Tests%20(dbg)(2)/builds/10949

- Relanding 61718.

I disabled the GPU watchdog in three new cases:
- If the OSMesa software renderer is in use. This will disable it on bots.
- When running on valgrind, whether on a bot or locally.
- In debug builds

I added a GPU process initialization time to the GPU info.

I moved the GPU initialization code outside the watchdog protection because it can take a long time and trigger the watchdog.

I increased the timeout. I set up a field trial with different timeouts to see the rate of failure for each period.

I made ui_tests always run with OSMesa, for consistent operation on bots and when run locally.

Original CL description:

I added a watchdog thread that intermitently checks the main thread can respond
to tasks posted on its message queue.

I fixed some bugs that preventede GGL from failing when the GPU channel was
lost.

Added a command line swith to disable the watchdog thread for debugging
purposes.

TEST=try, local testing of all features
BUG=none

Review URL: http://codereview.chromium.org/3794011

TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/3979004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63396 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 3c4e38e..1ffd0fe 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -70,7 +70,7 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize(
   GpuChannelHost* host = render_thread->EstablishGpuChannelSync();
   if (!host)
     return false;
-  DCHECK(host->state() == GpuChannelHost::kConnected);
+  DCHECK(host->state() == GpuChannelHost::CONNECTED);
 
   // Convert WebGL context creation attributes into GGL/EGL size requests.
   const int alpha_size = attributes.alpha ? 8 : 0;