summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_restore_uitest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 02:47:06 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 02:47:06 +0000
commitcee3e2c22458479369858319eb516f7c190890e5 (patch)
tree3c080cb4cef88b47fadd16ac966063e263237b8c /chrome/browser/tab_restore_uitest.cc
parentb21786bcd8f72dd0616cf233f0bb3a545b5ffdba (diff)
downloadchromium_src-cee3e2c22458479369858319eb516f7c190890e5.zip
chromium_src-cee3e2c22458479369858319eb516f7c190890e5.tar.gz
chromium_src-cee3e2c22458479369858319eb516f7c190890e5.tar.bz2
Revert "Disabling BasicRestoreFromClosedWindow for chromeos as well."
This reverts commit 7d4e4e51254eb464f0207768efde87cd9489bb89. I'm stupid... TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/2976005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
-rw-r--r--chrome/browser/tab_restore_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index f94b9d1..f40178e 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -22,10 +22,10 @@
#include "net/url_request/url_request_unittest.h"
// http://code.google.com/p/chromium/issues/detail?id=14774
-#if !defined(OS_WIN) && !defined(OS_CHROMEOS) && defined(NDEBUG)
-#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
-#else
+#if defined(OS_WIN) && !defined(NDEBUG)
#define MAYBE_BasicRestoreFromClosedWindow DISABLED_BasicRestoreFromClosedWindow
+#else
+#define MAYBE_BasicRestoreFromClosedWindow BasicRestoreFromClosedWindow
#endif
// http://crbug.com/