Fix even more remaining uses of WeakPtr<T>'s operator T* conversion

gpu/command_buffer/service/context_group.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 "gpu/command_buffer/service/context_group.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 224 matching lines @@
   decoders_.push_back(base::AsWeakPtr<GLES2Decoder>(decoder));
   return true;
 }
 
 namespace {
 
 bool IsNull(const base::WeakPtr<gles2::GLES2Decoder>& decoder) {
   return !decoder.get();
 }
 
+template <typename T>
+class WeakPtrEquals {
+ public:
+  explicit WeakPtrEquals(T* t) : t_(t) {}
+
+  bool operator()(const base::WeakPtr<T>& t) {
+    return t.get() == t_;
+  }
+
+ private:
+  T* const t_;
+};
+
 }  // namespace anonymous
 
 bool ContextGroup::HaveContexts() {
   decoders_.erase(std::remove_if(decoders_.begin(), decoders_.end(), IsNull),
                   decoders_.end());
   return !decoders_.empty();
 }
 
 void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
-  decoders_.erase(std::remove(decoders_.begin(), decoders_.end(),
-                              decoder->AsWeakPtr()),
+  decoders_.erase(std::remove_if(decoders_.begin(), decoders_.end(),
+                                 WeakPtrEquals<gles2::GLES2Decoder>(decoder)),
                   decoders_.end());
   // If we still have contexts do nothing.
   if (HaveContexts()) {
     return;
   }
 
   if (buffer_manager_ != NULL) {
     buffer_manager_->Destroy(have_context);
     buffer_manager_.reset();
   }
@@ skipping 88 matching lines @@
     GLenum pname, GLint min_required, uint32* v) {
   uint32 value = 0;
   GetIntegerv(pname, &value);
   bool result = CheckGLFeatureU(min_required, &value);
   *v = value;
   return result;
 }
 
 }  // namespace gles2
 }  // namespace gpu