RefCounted types should not have public destructors, content/browser part 2

content/renderer/gpu/compositor_thread.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 "content/renderer/gpu/compositor_thread.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "content/renderer/gpu/input_event_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebActiveWheelFlingParameters.h"
@@ skipping 24 matching lines @@
   }
 
   virtual void transferActiveWheelFlingAnimation(
       const WebKit::WebActiveWheelFlingParameters& params) {
     main_loop_->PostTask(
         FROM_HERE,
         base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation,
                    render_view_impl_, params));
   }
 
-  virtual ~InputHandlerWrapper() {
-    input_handler_->setClient(NULL);
-  }
-
   int routing_id() const { return routing_id_; }
   WebKit::WebCompositorInputHandler* input_handler() const {
     return input_handler_;
   }
 
   // WebCompositorInputHandlerClient methods:
 
   virtual void willShutdown() {
     compositor_thread_->RemoveInputHandler(routing_id_);
   }
 
   virtual void didHandleInputEvent() {
     compositor_thread_->filter_->DidHandleInputEvent();
   }
 
   virtual void didNotHandleInputEvent(bool send_to_widget) {
     compositor_thread_->filter_->DidNotHandleInputEvent(send_to_widget);
   }
 
  private:
+  friend base::RefCountedThreadSafe<InputHandlerWrapper>;
+
+  virtual ~InputHandlerWrapper() {
+    input_handler_->setClient(NULL);
+  }
+
   CompositorThread* compositor_thread_;
   int routing_id_;
   WebKit::WebCompositorInputHandler* input_handler_;
   scoped_refptr<base::MessageLoopProxy> main_loop_;
 
   // Can only be accessed on the main thread.
   base::WeakPtr<RenderViewImpl> render_view_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(InputHandlerWrapper);
 };
@@ skipping 75 matching lines @@
   InputHandlerMap::iterator it = input_handlers_.find(routing_id);
   if (it == input_handlers_.end()) {
     TRACE_EVENT0("CompositorThread::HandleInputEvent", "NoInputHandlerFound");
     // Oops, we no longer have an interested input handler..
     filter_->DidNotHandleInputEvent(true);
     return;
   }
 
   it->second->input_handler()->handleInputEvent(*input_event);
 }