Index: chrome/browser/ui/browser_browsertest.cc |
=================================================================== |
--- chrome/browser/ui/browser_browsertest.cc (revision 275947) |
+++ chrome/browser/ui/browser_browsertest.cc (working copy) |
@@ -832,7 +832,7 @@ |
alert->native_dialog()->CancelAppModalDialog(); |
// Navigate to another url, and check that we get a "before unload" dialog. |
- GURL url2(std::string("about:blank")); |
+ GURL url2(content::kAboutBlankURL); |
browser()->OpenURL(OpenURLParams( |
url2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); |
@@ -893,7 +893,7 @@ |
ui_test_utils::BrowserAddedObserver browser_added_observer; |
chrome::NewEmptyWindow(browser()->profile(), chrome::GetActiveDesktop()); |
Browser* second_window = browser_added_observer.WaitForSingleNewBrowser(); |
- ui_test_utils::NavigateToURL(second_window, GURL("about:blank")); |
+ ui_test_utils::NavigateToURL(second_window, GURL(content::kAboutBlankURL)); |
// Tell the application to quit. IDC_EXIT calls AttemptUserExit, which on |
// everything but ChromeOS allows unload handlers to block exit. On that |
@@ -1170,7 +1170,7 @@ |
ui_test_utils::NavigateToURL(browser(), downloads_url); |
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
- GURL blank_url(content::kAboutBlankURL); |
+ GURL blank_url(std::string("about:blank")); |
ui_test_utils::NavigateToURL(browser(), blank_url); |
EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); |
} |
@@ -1408,7 +1408,6 @@ |
ASSERT_NO_FATAL_FAILURE(dynamic_data_scope.Init()); |
ASSERT_TRUE(test_server()->Start()); |
- //std::string lang; |
LanguageDetectionDetails details; |
// Open a new tab with a page in English. |
@@ -1484,7 +1483,7 @@ |
// Add a pinned non-app tab. |
chrome::NewTab(browser()); |
- ui_test_utils::NavigateToURL(browser(), GURL(content::kAboutBlankURL)); |
+ ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
model->SetTabPinned(2, true); |
// Write out the pinned tabs. |
@@ -2133,10 +2132,9 @@ |
EXPECT_EQ(title, title_watcher.WaitAndGetTitle()); |
} |
-// GTK doesn't use the Browser's fullscreen state. |
// TODO(linux_aura) http://crbug.com/163931 |
// Mac disabled: http://crbug.com/169820 |
-#if !defined(TOOLKIT_GTK) && !defined(OS_MACOSX) && \ |
+#if !defined(OS_MACOSX) && \ |
!(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
IN_PROC_BROWSER_TEST_F(BrowserTest, FullscreenBookmarkBar) { |
#if defined(OS_WIN) && defined(USE_ASH) |
@@ -2183,9 +2181,9 @@ |
} |
}; |
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
-// http://crbug.com/103912 |
-// TODO(linux_aura) http://crbug.com/163931 |
+#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) |
+// Mac: http://crbug.com/103912 |
+// Linux: http://crbug.com/163931 |
#define MAYBE_EnableKioskModeTest DISABLED_EnableKioskModeTest |
#else |
#define MAYBE_EnableKioskModeTest EnableKioskModeTest |