OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/string_util.h" | 5 #include "base/string_util.h" |
| 6 #include "base/utf_string_conversions.h" |
6 #include "chrome/browser/autocomplete/autocomplete.h" | 7 #include "chrome/browser/autocomplete/autocomplete.h" |
7 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 8 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
8 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 9 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
9 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 10 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
10 #include "chrome/browser/browser.h" | 11 #include "chrome/browser/browser.h" |
11 #include "chrome/browser/browser_window.h" | 12 #include "chrome/browser/browser_window.h" |
12 #include "chrome/browser/history/history.h" | 13 #include "chrome/browser/history/history.h" |
13 #include "chrome/browser/location_bar.h" | 14 #include "chrome/browser/location_bar.h" |
14 #include "chrome/browser/profile.h" | 15 #include "chrome/browser/profile.h" |
15 #include "chrome/browser/tab_contents/tab_contents.h" | 16 #include "chrome/browser/tab_contents/tab_contents.h" |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 -1, TabStripModel::ADD_SELECTED, NULL, std::string()); | 149 -1, TabStripModel::ADD_SELECTED, NULL, std::string()); |
149 ui_test_utils::WaitForNavigation( | 150 ui_test_utils::WaitForNavigation( |
150 &browser()->GetSelectedTabContents()->controller()); | 151 &browser()->GetSelectedTabContents()->controller()); |
151 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), | 152 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), |
152 location_bar->location_entry()->GetText()); | 153 location_bar->location_entry()->GetText()); |
153 browser()->CloseTab(); | 154 browser()->CloseTab(); |
154 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), | 155 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), |
155 location_bar->location_entry()->GetText()); | 156 location_bar->location_entry()->GetText()); |
156 EXPECT_TRUE(location_bar->location_entry()->IsSelectAll()); | 157 EXPECT_TRUE(location_bar->location_entry()->IsSelectAll()); |
157 } | 158 } |
OLD | NEW |