diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 02:31:27 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 02:31:27 +0000 |
| commit | 18bdd3dddcff906c331885688851afb2c596034a (patch) | |
| tree | b1cbfb87f07c837c5bf57962d98e197ca75c34bc /ash/test | |
| parent | 899617f02fadb9caa43a51fd05a92d1be76bf35a (diff) | |
| download | chromium_src-18bdd3dddcff906c331885688851afb2c596034a.zip chromium_src-18bdd3dddcff906c331885688851afb2c596034a.tar.gz chromium_src-18bdd3dddcff906c331885688851afb2c596034a.tar.bz2 | |
Move test headers from content\test to content\public\test. This way we can enforce that internal content headers don't leak to embedders.
BUG=98716
TBR=phajdan.jr
Review URL: https://chromiumcodereview.appspot.com/10492009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -rw-r--r-- | ash/test/DEPS | 1 | ||||
| -rw-r--r-- | ash/test/test_shell_delegate.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ash/test/DEPS b/ash/test/DEPS index 659b105..ace334c 100644 --- a/ash/test/DEPS +++ b/ash/test/DEPS @@ -1,3 +1,4 @@ include_rules = [ + "+content/public/test", "+content/test", ] diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 80a6894..258770a 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -10,7 +10,7 @@ #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 "content/public/test/test_browser_context.h" #include "grit/ui_resources.h" #include "ui/aura/window.h" @@ -73,7 +73,7 @@ void TestShellDelegate::ShowTaskManager() { } content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { - return new TestBrowserContext(); + return new content::TestBrowserContext(); } void TestShellDelegate::ToggleSpokenFeedback() { |