Fix build error in release mode.

I used a mix of NDEBUG and DHECK, but I didn't realise
that DCHECKs are still compiled in release builds, and
that the try bots don't catch this.

Updated to use base::NonThreadSafe, which is both
simpler and safer.

TBR=kbr@chromium.org
Review URL: http://codereview.chromium.org/7834021

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

1 files changed, 3 insertions, 6 deletions

diff --git a/content/renderer/gpu/renderer_gl_context.h b/content/renderer/gpu/renderer_gl_context.h
index 33e8806..8b04fd2 100644
--- a/content/renderer/gpu/renderer_gl_context.h
+++ b/content/renderer/gpu/renderer_gl_context.h
@@ -14,12 +14,12 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 class GpuChannelHost;
-class MessageLoop;
 class CommandBufferProxy;
 class GURL;
 class Task;
@@ -32,7 +32,8 @@ class GLES2Implementation;
 }
 }
 
-class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext> {
+class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext>,
+                          public base::NonThreadSafe {
  public:
   // These are the same error codes as used by EGL.
   enum Error {
@@ -199,10 +200,6 @@ class RendererGLContext : public base::SupportsWeakPtr<RendererGLContext> {
   gpu::gles2::GLES2Implementation* gles2_implementation_;
   Error last_error_;
   int frame_number_;
-#ifndef NDEBUG
-  // Used to assert that this object is used on a single thread.
-  MessageLoop* message_loop_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(RendererGLContext);
 };