OLD | NEW |
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 807 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
818 GURL url(test_server()->GetURL("files/onload_redirect_to_anchor.html")); | 818 GURL url(test_server()->GetURL("files/onload_redirect_to_anchor.html")); |
819 GURL expected_favicon_url(test_server()->GetURL("files/test.png")); | 819 GURL expected_favicon_url(test_server()->GetURL("files/test.png")); |
820 | 820 |
821 ui_test_utils::NavigateToURL(browser(), url); | 821 ui_test_utils::NavigateToURL(browser(), url); |
822 | 822 |
823 NavigationEntry* entry = browser()->GetSelectedWebContents()-> | 823 NavigationEntry* entry = browser()->GetSelectedWebContents()-> |
824 GetController().GetActiveEntry(); | 824 GetController().GetActiveEntry(); |
825 EXPECT_EQ(expected_favicon_url.spec(), entry->GetFavicon().url.spec()); | 825 EXPECT_EQ(expected_favicon_url.spec(), entry->GetFavicon().url.spec()); |
826 } | 826 } |
827 | 827 |
828 #if defined(OS_MACOSX) || defined(OS_LINUX) | 828 #if defined(OS_MACOSX) || defined(OS_LINUX) || defined (OS_WIN) |
829 // http://crbug.com/83828. On Mac 10.6, the failure rate is 14% | 829 // http://crbug.com/83828. On Mac 10.6, the failure rate is 14% |
830 #define MAYBE_FaviconChange DISABLED_FaviconChange | 830 #define MAYBE_FaviconChange DISABLED_FaviconChange |
831 #else | 831 #else |
832 #define MAYBE_FaviconChange FaviconChange | 832 #define MAYBE_FaviconChange FaviconChange |
833 #endif | 833 #endif |
834 // Test that an icon can be changed from JS. | 834 // Test that an icon can be changed from JS. |
835 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) { | 835 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) { |
836 static const FilePath::CharType* kFile = | 836 static const FilePath::CharType* kFile = |
837 FILE_PATH_LITERAL("onload_change_favicon.html"); | 837 FILE_PATH_LITERAL("onload_change_favicon.html"); |
838 GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), | 838 GURL file_url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), |
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1741 | 1741 |
1742 // The normal browser should now have four. | 1742 // The normal browser should now have four. |
1743 EXPECT_EQ(4, browser()->tab_count()); | 1743 EXPECT_EQ(4, browser()->tab_count()); |
1744 | 1744 |
1745 // Close the additional browsers. | 1745 // Close the additional browsers. |
1746 popup_browser->CloseAllTabs(); | 1746 popup_browser->CloseAllTabs(); |
1747 app_browser->CloseAllTabs(); | 1747 app_browser->CloseAllTabs(); |
1748 app_popup_browser->CloseAllTabs(); | 1748 app_popup_browser->CloseAllTabs(); |
1749 } | 1749 } |
1750 #endif | 1750 #endif |
OLD | NEW |