6 files changed, 3 insertions, 28 deletions
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 49eb26d..bc44ac9 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -49,17 +49,12 @@ class FilePath;
 class GURL;
 class NavigationState;
 class PrintWebViewHelper;
-class RenderThread;
-class ResourceDispatcher;
 class WebFrame;
 class WebPluginDelegate;
 class WebPluginDelegateProxy;
 class WebDevToolsAgentDelegate;
-struct FindInPageRequest;
 struct ThumbnailScore;
 struct ViewMsg_Navigate_Params;
-struct ViewMsg_PrintPage_Params;
-struct ViewMsg_Print_Params;
 struct ViewMsg_UploadFile_Params;
 struct WebDropData;
 
@@ -73,9 +68,9 @@ struct FileUploadData;
 
 namespace WebKit {
 class WebDragData;
-struct WebFindOptions;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
+struct WebFindOptions;
 }
 
 // We need to prevent a page from trying to create infinite popups. It is not
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 4c5b17c..3be99d8 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -51,14 +51,6 @@ class RenderWidget : public IPC::Channel::Listener,
     return webwidget_;
   }
 
-  // Implementing RefCounting required for WebWidgetDelegate
-  virtual void AddRef() {
-    base::RefCounted<RenderWidget>::AddRef();
-  }
-  virtual void Release() {
-    base::RefCounted<RenderWidget>::Release();
-  }
-
   // IPC::Channel::Listener
   virtual void OnMessageReceived(const IPC::Message& msg);
 
diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h
index ac85c06..d55df1a 100644
--- a/webkit/glue/webview_impl.h
+++ b/webkit/glue/webview_impl.h
@@ -144,7 +144,7 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
   static WebViewImpl* FromPage(WebCore::Page* page);
 
   WebViewDelegate* delegate() {
-    return delegate_.get();
+    return delegate_;
   }
 
   // Returns the page object associated with this view.  This may be NULL when
@@ -228,7 +228,7 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> {
                        WebCore::Frame* frame,
                        const WebCore::PlatformKeyboardEvent& e);
 
-  scoped_refptr<WebViewDelegate> delegate_;
+  WebViewDelegate* delegate_;
   WebKit::WebSize size_;
 
   WebKit::WebPoint last_mouse_position_;
diff --git a/webkit/glue/webwidget_delegate.h b/webkit/glue/webwidget_delegate.h
index 824b665..17704b0d 100644
--- a/webkit/glue/webwidget_delegate.h
+++ b/webkit/glue/webwidget_delegate.h
@@ -117,10 +117,6 @@ class WebWidgetDelegate {
   // is closed.  This is used to support |window.showModalDialog|.
   virtual void RunModal(WebWidget* webwidget) = 0;
 
-  // Owners depend on the delegates living as long as they do, so we ref them.
-  virtual void AddRef() = 0;
-  virtual void Release() = 0;
-
   // Returns true if the widget is in a background tab.
   virtual bool IsHidden(WebWidget* webwidget) = 0;
 
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index d1ba068..e42dbfe 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -46,8 +46,6 @@ using WebKit::WebWorkerClient;
 class WorkerWebViewDelegate : public WebViewDelegate {
  public:
   WorkerWebViewDelegate() {}
-  virtual void AddRef() { }
-  virtual void Release() { }
   virtual void Blur(WebWidget *webwidget) { }
   virtual void CloseWidgetSoon(WebWidget *webwidget) { }
   virtual void DidInvalidateRect(WebWidget *webwidget,
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index f463c22..1ce235e 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -247,12 +247,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
   virtual void RunModal(WebWidget* webwidget);
   virtual bool IsHidden(WebWidget* webwidget);
   virtual WebKit::WebScreenInfo GetScreenInfo(WebWidget* webwidget);
-  virtual void AddRef() {
-    base::RefCounted<TestWebViewDelegate>::AddRef();
-  }
-  virtual void Release() {
-    base::RefCounted<TestWebViewDelegate>::Release();
-  }
 
   void SetSmartInsertDeleteEnabled(bool enabled);
   void SetSelectTrailingWhitespaceEnabled(bool enabled);