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, 0 insertions, 8 deletions

diff --git a/chrome/common/gpu_info.h b/chrome/common/gpu_info.h
index bdf8709..50728db 100644
--- a/chrome/common/gpu_info.h
+++ b/chrome/common/gpu_info.h
@@ -12,7 +12,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/time.h"
 #include "build/build_config.h"
 #include "chrome/common/dx_diag_node.h"
 
@@ -24,10 +23,6 @@ class GPUInfo {
   // Returns whether this GPUInfo has been initialized with information
   bool initialized() const;
 
-  // The amount of time taken to get from the process starting to the message
-  // loop being pumped.
-  base::TimeDelta initialization_time() const;
-
   // Return the DWORD (uint32) representing the graphics card vendor id.
   uint32 vendor_id() const;
 
@@ -60,8 +55,6 @@ class GPUInfo {
   // semantics are available.
   bool can_lose_context() const;
 
-  void SetInitializationTime(const base::TimeDelta& initialization_time);
-
   // Populate variables with passed in values
   void SetGraphicsInfo(uint32 vendor_id, uint32 device_id,
                        const std::wstring& driver_version,
@@ -79,7 +72,6 @@ class GPUInfo {
 
  private:
   bool initialized_;
-  base::TimeDelta initialization_time_;
   uint32 vendor_id_;
   uint32 device_id_;
   std::wstring driver_version_;