1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 96a5ca5..12df625 100755
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -117,6 +117,11 @@ TestShell::TestShell()
 }
 
 TestShell::~TestShell() {
+#if defined(OS_WIN)
+  if (m_webViewHost.get())
+    RevokeDragDrop(webViewWnd());
+#endif
+
   // Navigate to an empty page to fire all the destruction logic for the
   // current page.
   LoadURL(L"about:blank");
@@ -125,6 +130,7 @@ TestShell::~TestShell() {
   CallJSGC();
   CallJSGC();
 
+  delegate_->clear_test_shell();
   webView()->SetDelegate(NULL);
   PlatformCleanUp();
 
@@ -462,6 +468,7 @@ void TestShell::ResetTestController() {
   event_sending_controller_->Reset();
 
   // Reset state in the test webview delegate.
+  delegate_->clear_test_shell();
   delegate_ = new TestWebViewDelegate(this);
   webView()->SetDelegate(delegate_);
 }