| 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 <stdio.h> | 5 #include <stdio.h> |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 1812 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1823 test_toolbar_model->set_text(url_b); | 1823 test_toolbar_model->set_text(url_b); |
| 1824 omnibox_view->Update(); | 1824 omnibox_view->Update(); |
| 1825 EXPECT_EQ(url_a, omnibox_view->GetText()); | 1825 EXPECT_EQ(url_a, omnibox_view->GetText()); |
| 1826 omnibox_view->RevertAll(); | 1826 omnibox_view->RevertAll(); |
| 1827 EXPECT_EQ(url_b, omnibox_view->GetText()); | 1827 EXPECT_EQ(url_b, omnibox_view->GetText()); |
| 1828 test_toolbar_model->set_text(url_c); | 1828 test_toolbar_model->set_text(url_c); |
| 1829 omnibox_view->Update(); | 1829 omnibox_view->Update(); |
| 1830 EXPECT_EQ(url_c, omnibox_view->GetText()); | 1830 EXPECT_EQ(url_c, omnibox_view->GetText()); |
| 1831 } | 1831 } |
| 1832 | 1832 |
| 1833 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, InputResetsSearchTermReplacement) { | 1833 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) { |
| 1834 browser()->toolbar_model()->set_url_replacement_enabled(false); | 1834 browser()->toolbar_model()->set_url_replacement_enabled(true); |
| 1835 chrome::FocusLocationBar(browser()); | 1835 chrome::FocusLocationBar(browser()); |
| 1836 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0)); | 1836 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0)); |
| 1837 EXPECT_TRUE(browser()->toolbar_model()->url_replacement_enabled()); | 1837 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled()); |
| 1838 } | 1838 } |
| OLD | NEW |