3 files changed, 1 insertions, 11 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index b97c923..d78971b 100644
--- a/webkit/tools/test_shell/test_webview_delegate.cc
+++ b/webkit/tools/test_shell/test_webview_delegate.cc
@@ -744,15 +744,6 @@ void TestWebViewDelegate::SetUserStyleSheetLocation(const GURL& location) {
 
 // WebWidgetDelegate ---------------------------------------------------------
 
-gfx::NativeViewId TestWebViewDelegate::GetContainingView(WebWidget* webwidget) {
-  // For test shell, we pack a NativeView pointer into the NativeViewId since
-  // everything is single process.
-  if (WebWidgetHost* host = GetHostForWidget(webwidget))
-    return gfx::IdFromNativeView(host->view_handle());
-
-  return NULL;
-}
-
 void TestWebViewDelegate::DidInvalidateRect(WebWidget* webwidget,
                                             const WebRect& rect) {
   if (WebWidgetHost* host = GetHostForWidget(webwidget))
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index 4c0f079..f463c22 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -222,7 +222,6 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
   virtual int GetHistoryForwardListCount();
 
   // WebWidgetDelegate
-  virtual gfx::NativeViewId GetContainingView(WebWidget* webwidget);
   virtual void DidInvalidateRect(WebWidget* webwidget,
                                  const WebKit::WebRect& rect);
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index c0dbc825..dc16544 100644
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -50,7 +50,7 @@ WebPluginDelegate* TestWebViewDelegate::CreatePluginDelegate(
     const std::string& mime_type,
     const std::string& clsid,
     std::string* actual_mime_type) {
-  HWND hwnd = gfx::NativeViewFromId(GetContainingView(webview));
+  HWND hwnd = shell_->webViewHost()->view_handle();
   if (!hwnd)
     return NULL;