| 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 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 EXPECT_EQ(title_watcher.WaitAndGetTitle(), | 482 EXPECT_EQ(title_watcher.WaitAndGetTitle(), |
| 483 base::ASCIIToUTF16(expected_title)); | 483 base::ASCIIToUTF16(expected_title)); |
| 484 } | 484 } |
| 485 | 485 |
| 486 void NavigateHistory(int num_navigations, | 486 void NavigateHistory(int num_navigations, |
| 487 HistoryNavigationDirection direction) { | 487 HistoryNavigationDirection direction) { |
| 488 content::TestNavigationObserver test_navigation_observer( | 488 content::TestNavigationObserver test_navigation_observer( |
| 489 browser()->tab_strip_model()->GetActiveWebContents(), | 489 browser()->tab_strip_model()->GetActiveWebContents(), |
| 490 num_navigations); | 490 num_navigations); |
| 491 if (direction == HISTORY_NAVIGATE_BACK) { | 491 if (direction == HISTORY_NAVIGATE_BACK) { |
| 492 chrome::GoBack(browser(), CURRENT_TAB); | 492 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 493 } else if (direction == HISTORY_NAVIGATE_FORWARD) { | 493 } else if (direction == HISTORY_NAVIGATE_FORWARD) { |
| 494 chrome::GoForward(browser(), CURRENT_TAB); | 494 chrome::GoForward(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 495 } else { | 495 } else { |
| 496 FAIL(); | 496 FAIL(); |
| 497 } | 497 } |
| 498 test_navigation_observer.Wait(); | 498 test_navigation_observer.Wait(); |
| 499 } | 499 } |
| 500 | 500 |
| 501 LinkDoctorInterceptor* link_doctor_interceptor_; | 501 LinkDoctorInterceptor* link_doctor_interceptor_; |
| 502 }; | 502 }; |
| 503 | 503 |
| 504 class TestFailProvisionalLoadObserver : public content::WebContentsObserver { | 504 class TestFailProvisionalLoadObserver : public content::WebContentsObserver { |
| (...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1533 Http09WeirdPortEnabled) { | 1533 Http09WeirdPortEnabled) { |
| 1534 const char kHttp09Response[] = "JumboShrimp"; | 1534 const char kHttp09Response[] = "JumboShrimp"; |
| 1535 ASSERT_TRUE(embedded_test_server()->Start()); | 1535 ASSERT_TRUE(embedded_test_server()->Start()); |
| 1536 ui_test_utils::NavigateToURL( | 1536 ui_test_utils::NavigateToURL( |
| 1537 browser(), embedded_test_server()->GetURL(std::string("/echo-raw?") + | 1537 browser(), embedded_test_server()->GetURL(std::string("/echo-raw?") + |
| 1538 kHttp09Response)); | 1538 kHttp09Response)); |
| 1539 EXPECT_TRUE(IsDisplayingText(browser(), kHttp09Response)); | 1539 EXPECT_TRUE(IsDisplayingText(browser(), kHttp09Response)); |
| 1540 } | 1540 } |
| 1541 | 1541 |
| 1542 } // namespace | 1542 } // namespace |
| OLD | NEW |