4 files changed, 5 insertions, 20 deletions
diff --git a/ash/screensaver/screensaver_view_unittest.cc b/ash/screensaver/screensaver_view_unittest.cc
index 25cfb6d..47a19e2 100644
--- a/ash/screensaver/screensaver_view_unittest.cc
+++ b/ash/screensaver/screensaver_view_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/bind.h"
 #include "content/public/browser/browser_context.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/webview_test_helper.h"
 
 namespace ash {
@@ -17,7 +18,7 @@ class ScreensaverViewTest : public ash::test::AshTestBase {
  public:
   ScreensaverViewTest() {
     url_ = GURL("http://www.google.com");
-    views_delegate_.reset(new AshTestViewsDelegate);
+    views_delegate_.reset(new views::TestViewsDelegate);
     webview_test_helper_.reset(new views::WebViewTestHelper(message_loop()));
   }
 
@@ -56,7 +57,7 @@ class ScreensaverViewTest : public ash::test::AshTestBase {
   GURL url_;
 
  private:
-  scoped_ptr<AshTestViewsDelegate> views_delegate_;
+  scoped_ptr<views::TestViewsDelegate> views_delegate_;
   scoped_ptr<views::WebViewTestHelper> webview_test_helper_;
 
   DISALLOW_COPY_AND_ASSIGN(ScreensaverViewTest);
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 0e6b72b..ca7b9fc 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -8,7 +8,6 @@
 
 #include "ash/shell.h"
 #include "ash/test/test_shell_delegate.h"
-#include "content/test/web_contents_tester.h"
 #include "ui/aura/env.h"
 #include "ui/aura/monitor_manager.h"
 #include "ui/aura/root_window.h"
@@ -19,13 +18,6 @@
 namespace ash {
 namespace test {
 
-content::WebContents* AshTestViewsDelegate::CreateWebContents(
-    content::BrowserContext* browser_context,
-    content::SiteInstance* site_instance) {
-  return content::WebContentsTester::CreateTestWebContents(browser_context,
-                                                           site_instance);
-}
-
 AshTestBase::AshTestBase() {
 }
 
diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h
index 61d739f..c118a8a 100644
--- a/ash/test/ash_test_base.h
+++ b/ash/test/ash_test_base.h
@@ -10,19 +10,10 @@
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/views/test/test_views_delegate.h"
 
 namespace ash {
 namespace test {
 
-class AshTestViewsDelegate : public views::TestViewsDelegate {
- public:
-  // Overriden from TestViewsDelegate.
-  content::WebContents* CreateWebContents(
-      content::BrowserContext* browser_context,
-      content::SiteInstance* site_instance) OVERRIDE;
-};
-
 class AshTestBase : public testing::Test {
  public:
   AshTestBase();
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index 0cf97fc..21ae8ae 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -68,7 +68,8 @@ views::NativeWidgetHelperAura* TestViewsDelegate::CreateNativeWidgetHelper(
 content::WebContents* TestViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
-  return NULL;
+  return content::WebContentsTester::CreateTestWebContents(browser_context,
+                                                           site_instance);
 }
 
 }  // namespace views