Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(528)

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 10861003: Disable many tests failing on mac 10.7 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #if defined(OS_MACOSX) 10 #if defined(OS_MACOSX)
(...skipping 1468 matching lines...) Expand 10 before | Expand all | Expand 10 after
1479 1479
1480 class KioskModeTest : public BrowserTest { 1480 class KioskModeTest : public BrowserTest {
1481 public: 1481 public:
1482 KioskModeTest() {} 1482 KioskModeTest() {}
1483 1483
1484 virtual void SetUpCommandLine(CommandLine* command_line) { 1484 virtual void SetUpCommandLine(CommandLine* command_line) {
1485 command_line->AppendSwitch(switches::kKioskMode); 1485 command_line->AppendSwitch(switches::kKioskMode);
1486 } 1486 }
1487 }; 1487 };
1488 1488
1489 IN_PROC_BROWSER_TEST_F(KioskModeTest, EnableKioskModeTest) { 1489 #if defined(OS_MACOSX)
1490 // http://crbug.com/103912
1491 #define MAYBE_EnableKioskModeTest DISABLED_EnableKioskModeTest
1492 #else
1493 #define MAYBE_EnableKioskModeTest EnableKioskModeTest
1494 #endif
1495 IN_PROC_BROWSER_TEST_F(KioskModeTest, MAYBE_EnableKioskModeTest) {
1490 // Check if browser is in fullscreen mode. 1496 // Check if browser is in fullscreen mode.
1491 ASSERT_TRUE(browser()->window()->IsFullscreen()); 1497 ASSERT_TRUE(browser()->window()->IsFullscreen());
1492 ASSERT_FALSE(browser()->window()->IsFullscreenBubbleVisible()); 1498 ASSERT_FALSE(browser()->window()->IsFullscreenBubbleVisible());
1493 } 1499 }
1494 1500
1495 #if defined(OS_WIN) 1501 #if defined(OS_WIN)
1496 // This test verifies that Chrome can be launched with a user-data-dir path 1502 // This test verifies that Chrome can be launched with a user-data-dir path
1497 // which contains non ASCII characters. 1503 // which contains non ASCII characters.
1498 class LaunchBrowserWithNonAsciiUserDatadir : public BrowserTest { 1504 class LaunchBrowserWithNonAsciiUserDatadir : public BrowserTest {
1499 public: 1505 public:
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 command_line->AppendSwitchASCII(switches::kApp, url.spec()); 1590 command_line->AppendSwitchASCII(switches::kApp, url.spec());
1585 } 1591 }
1586 }; 1592 };
1587 1593
1588 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { 1594 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) {
1589 // Test that an application browser window loads correctly. 1595 // Test that an application browser window loads correctly.
1590 1596
1591 // Verify the browser is in application mode. 1597 // Verify the browser is in application mode.
1592 EXPECT_TRUE(browser()->IsApplication()); 1598 EXPECT_TRUE(browser()->IsApplication());
1593 } 1599 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698