diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:29:19 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-18 10:29:19 +0000 |
| commit | 87847948aca5b7a84d60a7b7c9587a5e4278dcf7 (patch) | |
| tree | 0db4f8fa238bb4117e5b478060f9b6963ae664b4 /ash/shell_unittest.cc | |
| parent | 3222c3267f36014363d5414f8e927b7f7eb8be47 (diff) | |
| download | chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.zip chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.tar.gz chromium_src-87847948aca5b7a84d60a7b7c9587a5e4278dcf7.tar.bz2 | |
Remove mac code from aura/ash/views
BUG=275898
Review URL: https://chromiumcodereview.appspot.com/23483041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_unittest.cc')
| -rw-r--r-- | ash/shell_unittest.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc index 0cc1e44..79c64f9b 100644 --- a/ash/shell_unittest.cc +++ b/ash/shell_unittest.cc @@ -386,13 +386,7 @@ TEST_F(ShellTest, LockScreenClosesActiveMenu) { views::MenuRunner::CONTEXT_MENU)); } -// Fails on Mac, see http://crbug.com/115662 -#if defined(OS_MACOSX) -#define MAYBE_ManagedWindowModeBasics DISABLED_ManagedWindowModeBasics -#else -#define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics -#endif -TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) { +TEST_F(ShellTest, ManagedWindowModeBasics) { Shell* shell = Shell::GetInstance(); Shell::TestApi test_api(shell); |