Remove all but one use of WeakPtrFactory::DetachFromThread.

webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.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 "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 
 #include <GLES2/gl2.h>
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES 1
 #endif
@@ skipping 251 matching lines @@
     LAZY_INSTANCE_INITIALIZER;
 
 static base::LazyInstance<
     std::set<GLInProcessContext*> >
         g_all_shared_contexts = LAZY_INSTANCE_INITIALIZER;
 
 static bool g_use_virtualized_gl_context = false;
 
 namespace {
 
-// Also calls DetachFromThread on all GLES2Decoders before the lock is released
-// to maintain the invariant that all decoders are unbounded while the lock is
-// not held. This is to workaround DumpRenderTree uses WGC3DIPCBI with shared
-// resources on different threads.
+// Also calls DetachFromThreadHack on all GLES2Decoders before the lock is
+// released to maintain the invariant that all decoders are unbound while the
+// lock is not held. This is to workaround DumpRenderTree using WGC3DIPCBI with
+// shared resources on different threads.
+// Remove this as part of crbug.com/234964.
 class AutoLockAndDecoderDetachThread {
  public:
   AutoLockAndDecoderDetachThread(base::Lock& lock,
                                  const std::set<GLInProcessContext*>& contexts);
   ~AutoLockAndDecoderDetachThread();
 
  private:
   base::AutoLock auto_lock_;
   const std::set<GLInProcessContext*>& contexts_;
 };
 
 AutoLockAndDecoderDetachThread::AutoLockAndDecoderDetachThread(
     base::Lock& lock,
     const std::set<GLInProcessContext*>& contexts)
     : auto_lock_(lock),
       contexts_(contexts) {
 }
 
 void DetachThread(GLInProcessContext* context) {
   if (context->GetDecoder())
-    context->GetDecoder()->DetachFromThread();
+    context->GetDecoder()->DetachFromThreadHack();
 }
 
 AutoLockAndDecoderDetachThread::~AutoLockAndDecoderDetachThread() {
   std::for_each(contexts_.begin(),
                 contexts_.end(),
                 &DetachThread);
 }
 
 class ImageFactoryInProcess
      : public ImageFactory,
@@ skipping 1668 matching lines @@
 
 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
     WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
     WGC3Denum, WGC3Denum, const void*)
 
 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
     WGC3Denum)
 
 }  // namespace gpu
 }  // namespace webkit