| 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 "chrome/browser/ui/browser_navigator_browsertest.h" | 5 #include "chrome/browser/ui/browser_navigator_browsertest.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1039 // Bookmark manager is expected to always open in normal mode regardless | 1039 // Bookmark manager is expected to always open in normal mode regardless |
| 1040 // of whether the user is trying to open it in incognito mode or not. | 1040 // of whether the user is trying to open it in incognito mode or not. |
| 1041 // This test verifies that if incognito mode is forced (by policy), bookmark | 1041 // This test verifies that if incognito mode is forced (by policy), bookmark |
| 1042 // manager doesn't open at all. | 1042 // manager doesn't open at all. |
| 1043 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, | 1043 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, |
| 1044 Disposition_Bookmarks_DoNothingIfIncognitoIsForced) { | 1044 Disposition_Bookmarks_DoNothingIfIncognitoIsForced) { |
| 1045 RunDoNothingIfIncognitoIsForcedTest(GURL(chrome::kChromeUIBookmarksURL)); | 1045 RunDoNothingIfIncognitoIsForcedTest(GURL(chrome::kChromeUIBookmarksURL)); |
| 1046 } | 1046 } |
| 1047 | 1047 |
| 1048 // This test makes sure a crashed singleton tab reloads from a new navigation. | 1048 // This test makes sure a crashed singleton tab reloads from a new navigation. |
| 1049 // http://crbug.com/396371 |
| 1049 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, | 1050 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, |
| 1050 NavigateToCrashedSingletonTab) { | 1051 DISABLED_NavigateToCrashedSingletonTab) { |
| 1051 GURL singleton_url(GetContentSettingsURL()); | 1052 GURL singleton_url(GetContentSettingsURL()); |
| 1052 WebContents* web_contents = chrome::AddSelectedTabWithURL( | 1053 WebContents* web_contents = chrome::AddSelectedTabWithURL( |
| 1053 browser(), singleton_url, content::PAGE_TRANSITION_LINK); | 1054 browser(), singleton_url, content::PAGE_TRANSITION_LINK); |
| 1054 | 1055 |
| 1055 // We should have one browser with 2 tabs, the 2nd selected. | 1056 // We should have one browser with 2 tabs, the 2nd selected. |
| 1056 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); | 1057 EXPECT_EQ(1u, chrome::GetTotalBrowserCount()); |
| 1057 EXPECT_EQ(2, browser()->tab_strip_model()->count()); | 1058 EXPECT_EQ(2, browser()->tab_strip_model()->count()); |
| 1058 EXPECT_EQ(1, browser()->tab_strip_model()->active_index()); | 1059 EXPECT_EQ(1, browser()->tab_strip_model()->active_index()); |
| 1059 | 1060 |
| 1060 // Kill the singleton tab. | 1061 // Kill the singleton tab. |
| (...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1369 // Open a renderer initiated POST request in new foreground tab. | 1370 // Open a renderer initiated POST request in new foreground tab. |
| 1370 base::string16 expected_title(base::ASCIIToUTF16(kExpectedTitle)); | 1371 base::string16 expected_title(base::ASCIIToUTF16(kExpectedTitle)); |
| 1371 std::string post_data = kExpectedTitle; | 1372 std::string post_data = kExpectedTitle; |
| 1372 base::string16 title; | 1373 base::string16 title; |
| 1373 ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle( | 1374 ASSERT_TRUE(OpenPOSTURLInNewForegroundTabAndGetTitle( |
| 1374 test_server()->GetURL(kEchoTitleCommand), post_data, false, &title)); | 1375 test_server()->GetURL(kEchoTitleCommand), post_data, false, &title)); |
| 1375 EXPECT_NE(expected_title, title); | 1376 EXPECT_NE(expected_title, title); |
| 1376 } | 1377 } |
| 1377 | 1378 |
| 1378 } // namespace | 1379 } // namespace |
| OLD | NEW |