| 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 <memory> | 5 #include <memory> |
| 6 #include <utility> | 6 #include <utility> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 EXPECT_EQ(title_watcher.WaitAndGetTitle(), | 478 EXPECT_EQ(title_watcher.WaitAndGetTitle(), |
| 479 base::ASCIIToUTF16(expected_title)); | 479 base::ASCIIToUTF16(expected_title)); |
| 480 } | 480 } |
| 481 | 481 |
| 482 void NavigateHistory(int num_navigations, | 482 void NavigateHistory(int num_navigations, |
| 483 HistoryNavigationDirection direction) { | 483 HistoryNavigationDirection direction) { |
| 484 content::TestNavigationObserver test_navigation_observer( | 484 content::TestNavigationObserver test_navigation_observer( |
| 485 browser()->tab_strip_model()->GetActiveWebContents(), | 485 browser()->tab_strip_model()->GetActiveWebContents(), |
| 486 num_navigations); | 486 num_navigations); |
| 487 if (direction == HISTORY_NAVIGATE_BACK) { | 487 if (direction == HISTORY_NAVIGATE_BACK) { |
| 488 chrome::GoBack(browser(), CURRENT_TAB); | 488 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 489 } else if (direction == HISTORY_NAVIGATE_FORWARD) { | 489 } else if (direction == HISTORY_NAVIGATE_FORWARD) { |
| 490 chrome::GoForward(browser(), CURRENT_TAB); | 490 chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 491 } else { | 491 } else { |
| 492 FAIL(); | 492 FAIL(); |
| 493 } | 493 } |
| 494 test_navigation_observer.Wait(); | 494 test_navigation_observer.Wait(); |
| 495 } | 495 } |
| 496 | 496 |
| 497 LinkDoctorInterceptor* link_doctor_interceptor_; | 497 LinkDoctorInterceptor* link_doctor_interceptor_; |
| 498 }; | 498 }; |
| 499 | 499 |
| 500 class TestFailProvisionalLoadObserver : public content::WebContentsObserver { | 500 class TestFailProvisionalLoadObserver : public content::WebContentsObserver { |
| (...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1488 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) { | 1488 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) { |
| 1489 // ERR_UNSAFE_PORT will not trigger navigation corrections. | 1489 // ERR_UNSAFE_PORT will not trigger navigation corrections. |
| 1490 ui_test_utils::NavigateToURL( | 1490 ui_test_utils::NavigateToURL( |
| 1491 browser(), | 1491 browser(), |
| 1492 URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT, | 1492 URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT, |
| 1493 kHostname)); | 1493 kHostname)); |
| 1494 EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode)); | 1494 EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode)); |
| 1495 } | 1495 } |
| 1496 | 1496 |
| 1497 } // namespace | 1497 } // namespace |
| OLD | NEW |