| Index: chrome/browser/ui/browser_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_browsertest.cc (revision 277810)
|
| +++ chrome/browser/ui/browser_browsertest.cc (working copy)
|
| @@ -833,7 +833,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(url::kAboutBlankURL);
|
| browser()->OpenURL(OpenURLParams(
|
| url2, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
|
|
|
| @@ -894,7 +894,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(url::kAboutBlankURL));
|
|
|
| // Tell the application to quit. IDC_EXIT calls AttemptUserExit, which on
|
| // everything but ChromeOS allows unload handlers to block exit. On that
|
| @@ -1409,7 +1409,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.
|
| @@ -2134,10 +2133,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)
|
| @@ -2184,9 +2182,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
|
|
|