| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/google/google_util.h" | 7 #include "chrome/browser/google/google_util.h" |
| 8 #include "chrome/browser/net/url_request_mock_util.h" | 8 #include "chrome/browser/net/url_request_mock_util.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 num_navigations); | 102 num_navigations); |
| 103 if (direction == HISTORY_NAVIGATE_BACK) { | 103 if (direction == HISTORY_NAVIGATE_BACK) { |
| 104 chrome::GoBack(browser(), CURRENT_TAB); | 104 chrome::GoBack(browser(), CURRENT_TAB); |
| 105 } else if (direction == HISTORY_NAVIGATE_FORWARD) { | 105 } else if (direction == HISTORY_NAVIGATE_FORWARD) { |
| 106 chrome::GoForward(browser(), CURRENT_TAB); | 106 chrome::GoForward(browser(), CURRENT_TAB); |
| 107 } else { | 107 } else { |
| 108 FAIL(); | 108 FAIL(); |
| 109 } | 109 } |
| 110 test_navigation_observer.WaitForObservation( | 110 test_navigation_observer.WaitForObservation( |
| 111 base::Bind(&content::RunMessageLoop), | 111 base::Bind(&content::RunMessageLoop), |
| 112 base::Bind(&MessageLoop::Quit, | 112 base::Bind(&base::MessageLoop::Quit, |
| 113 base::Unretained(MessageLoopForUI::current()))); | 113 base::Unretained(base::MessageLoopForUI::current()))); |
| 114 | 114 |
| 115 EXPECT_EQ(title_watcher.WaitAndGetTitle(), ASCIIToUTF16(expected_title)); | 115 EXPECT_EQ(title_watcher.WaitAndGetTitle(), ASCIIToUTF16(expected_title)); |
| 116 } | 116 } |
| 117 }; | 117 }; |
| 118 | 118 |
| 119 // See crbug.com/109669 | 119 // See crbug.com/109669 |
| 120 #if defined(USE_AURA) | 120 #if defined(USE_AURA) |
| 121 #define MAYBE_DNSError_Basic DISABLED_DNSError_Basic | 121 #define MAYBE_DNSError_Basic DISABLED_DNSError_Basic |
| 122 #else | 122 #else |
| 123 #define MAYBE_DNSError_Basic DNSError_Basic | 123 #define MAYBE_DNSError_Basic DNSError_Basic |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( | 326 EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
| 327 browser()->tab_strip_model()->GetActiveWebContents(), | 327 browser()->tab_strip_model()->GetActiveWebContents(), |
| 328 "var textContent = document.body.textContent;" | 328 "var textContent = document.body.textContent;" |
| 329 "var hasError = textContent.indexOf('ERR_NAME_NOT_RESOLVED') >= 0;" | 329 "var hasError = textContent.indexOf('ERR_NAME_NOT_RESOLVED') >= 0;" |
| 330 "domAutomationController.send(hasError);", | 330 "domAutomationController.send(hasError);", |
| 331 &result)); | 331 &result)); |
| 332 EXPECT_TRUE(result); | 332 EXPECT_TRUE(result); |
| 333 } | 333 } |
| 334 | 334 |
| 335 } // namespace | 335 } // namespace |
| OLD | NEW |