summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 20:31:10 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 20:31:10 +0000
commit3d58bf7f98b0bc1b26c5d7c919edd49e919273a8 (patch)
tree20571bb66ed6e45d3236e5a537042234f40ebff4 /chrome/browser/browser_browsertest.cc
parent54fe91778e4ed5d5a8a513c6883ae40a2a7c1f6f (diff)
downloadchromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.zip
chromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.tar.gz
chromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.tar.bz2
Disables phantom tabs. I'm not nuking all the code as Nicholas/Glen thought we may yet try them again shortly.
BUG=46852 TEST=none Review URL: http://codereview.chromium.org/2833026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 5371199..4d4773c 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -428,10 +428,16 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, FaviconChange) {
// TODO(sky): get these to run on a Mac.
#if !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(BrowserTest, PhantomTab) {
+ if (!browser_defaults::kPhantomTabsEnabled)
+ return;
+
PhantomTabTest();
}
IN_PROC_BROWSER_TEST_F(BrowserTest, RevivePhantomTab) {
+ if (!browser_defaults::kPhantomTabsEnabled)
+ return;
+
PhantomTabTest();
if (HasFatalFailure())
@@ -486,6 +492,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) {
}
IN_PROC_BROWSER_TEST_F(BrowserTest, AppTabRemovedWhenExtensionUninstalled) {
+ if (!browser_defaults::kPhantomTabsEnabled)
+ return;
+
PhantomTabTest();
Extension* extension = GetExtension();