| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #if defined(OS_MACOSX) | 9 #if defined(OS_MACOSX) |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 803 browser(), GURL(test_server()->GetURL("files/french_page.html"))); | 803 browser(), GURL(test_server()->GetURL("files/french_page.html"))); |
| 804 fr_language_detected_signal.Wait(); | 804 fr_language_detected_signal.Wait(); |
| 805 lang.clear(); | 805 lang.clear(); |
| 806 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( | 806 EXPECT_TRUE(fr_language_detected_signal.GetDetailsFor( |
| 807 source.map_key(), &lang)); | 807 source.map_key(), &lang)); |
| 808 EXPECT_EQ("fr", lang); | 808 EXPECT_EQ("fr", lang); |
| 809 EXPECT_EQ("fr", helper->language_state().original_language()); | 809 EXPECT_EQ("fr", helper->language_state().original_language()); |
| 810 } | 810 } |
| 811 | 811 |
| 812 #if defined(OS_MACOSX) | 812 #if defined(OS_MACOSX) |
| 813 // http://crbug.com/100467 | 813 // http://crbug.com/104265 |
| 814 #define MAYBE_TestNewTabExitsFullscreen FAILS_TestNewTabExitsFullscreen | 814 #define MAYBE_TestNewTabExitsFullscreen DISABLED_TestNewTabExitsFullscreen |
| 815 #else | 815 #else |
| 816 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen | 816 #define MAYBE_TestNewTabExitsFullscreen TestNewTabExitsFullscreen |
| 817 #endif | 817 #endif |
| 818 | 818 |
| 819 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestNewTabExitsFullscreen) { | 819 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TestNewTabExitsFullscreen) { |
| 820 ASSERT_TRUE(test_server()->Start()); | 820 ASSERT_TRUE(test_server()->Start()); |
| 821 | 821 |
| 822 AddTabAtIndex( | 822 AddTabAtIndex( |
| 823 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); | 823 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); |
| 824 | 824 |
| (...skipping 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1349 | 1349 |
| 1350 // The normal browser should now have four. | 1350 // The normal browser should now have four. |
| 1351 EXPECT_EQ(4, browser()->tab_count()); | 1351 EXPECT_EQ(4, browser()->tab_count()); |
| 1352 | 1352 |
| 1353 // Close the additional browsers. | 1353 // Close the additional browsers. |
| 1354 popup_browser->CloseAllTabs(); | 1354 popup_browser->CloseAllTabs(); |
| 1355 app_browser->CloseAllTabs(); | 1355 app_browser->CloseAllTabs(); |
| 1356 app_popup_browser->CloseAllTabs(); | 1356 app_popup_browser->CloseAllTabs(); |
| 1357 } | 1357 } |
| 1358 #endif | 1358 #endif |
| OLD | NEW |