summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:04:57 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 03:04:57 +0000
commitb691d6e5a21de1e84500b28011fdc7e709c16da1 (patch)
treef49a620e8b05881b64488eb6876080e97d080dad
parentcee3e2c22458479369858319eb516f7c190890e5 (diff)
downloadchromium_src-b691d6e5a21de1e84500b28011fdc7e709c16da1.zip
chromium_src-b691d6e5a21de1e84500b28011fdc7e709c16da1.tar.gz
chromium_src-b691d6e5a21de1e84500b28011fdc7e709c16da1.tar.bz2
Disable BasicRestoreFromClosedWindow for chromeos as well.
TBR=phajdan.jr@chromium.org BUG=14774 TEST=none Review URL: http://codereview.chromium.org/2937006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52160 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_restore_uitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index f40178e..c43f60f 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -22,7 +22,7 @@
#include "net/url_request/url_request_unittest.h"
// http://code.google.com/p/chromium/issues/detail?id=14774
-#if defined(OS_WIN) && !defined(NDEBUG)
+#if (defined(OS_WIN) || defined(OS_CHROMEOS)) && !defined(NDEBUG)
#define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow
#else
#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow