From 5defceece89b1953c722c479b8b0505045e01733 Mon Sep 17 00:00:00 2001 From: "caseq@google.com" Date: Wed, 2 May 2012 12:04:16 +0000 Subject: Revert r134889, "Re-implement the screensaver to use WebView instead of ExtensionDialogHost." The original change broke Win Aura and 3 Linux CrOs builders. TBR=rkc@chromium.org,finnur@chromium.org BUG=chromium-os:28211 TEST=tree goes green Review URL: https://chromiumcodereview.appspot.com/10314008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134893 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/test/DEPS | 3 --- ash/test/test_shell_delegate.cc | 5 ----- ash/test/test_shell_delegate.h | 1 - 3 files changed, 9 deletions(-) delete mode 100644 ash/test/DEPS (limited to 'ash/test') diff --git a/ash/test/DEPS b/ash/test/DEPS deleted file mode 100644 index 659b105..0000000 --- a/ash/test/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - "+content/test", -] diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index ad6f34a..f3dbea5 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -10,7 +10,6 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/test_launcher_delegate.h" -#include "content/test/test_browser_context.h" #include "grit/ui_resources.h" #include "ui/aura/window.h" @@ -60,10 +59,6 @@ void TestShellDelegate::OpenCrosh() { void TestShellDelegate::OpenMobileSetup() { } -content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { - return new TestBrowserContext(); -} - AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { return NULL; } diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h index ce04845..1788a4a 100644 --- a/ash/test/test_shell_delegate.h +++ b/ash/test/test_shell_delegate.h @@ -29,7 +29,6 @@ class TestShellDelegate : public ShellDelegate { virtual void OpenFileManager() OVERRIDE; virtual void OpenCrosh() OVERRIDE; virtual void OpenMobileSetup() OVERRIDE; - virtual content::BrowserContext* GetCurrentBrowserContext() OVERRIDE; virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE; virtual void StartPartialScreenshot( ScreenshotDelegate* screenshot_delegate) OVERRIDE; -- cgit v1.1