| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdio.h> | 6 #include <stdio.h> |
| 7 | 7 |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1211 // We always allow exact matches for non-substituting keywords. | 1211 // We always allow exact matches for non-substituting keywords. |
| 1212 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); | 1212 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys)); |
| 1213 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); | 1213 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); |
| 1214 ASSERT_TRUE(popup_model->IsOpen()); | 1214 ASSERT_TRUE(popup_model->IsOpen()); |
| 1215 ASSERT_EQ(AutocompleteMatchType::HISTORY_KEYWORD, | 1215 ASSERT_EQ(AutocompleteMatchType::HISTORY_KEYWORD, |
| 1216 popup_model->result().default_match()->type); | 1216 popup_model->result().default_match()->type); |
| 1217 ASSERT_EQ("http://abc.com/", | 1217 ASSERT_EQ("http://abc.com/", |
| 1218 popup_model->result().default_match()->destination_url.spec()); | 1218 popup_model->result().default_match()->destination_url.spec()); |
| 1219 } | 1219 } |
| 1220 | 1220 |
| 1221 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, DeleteItem) { | 1221 #if defined(OS_WIN) |
| 1222 #define MAYBE_DeleteItem DISABLED_DeleteItem |
| 1223 #else |
| 1224 #define MAYBE_DeleteItem DeleteItem |
| 1225 #endif |
| 1226 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_DeleteItem) { |
| 1222 // Disable the search provider, to make sure the popup contains only history | 1227 // Disable the search provider, to make sure the popup contains only history |
| 1223 // items. | 1228 // items. |
| 1224 TemplateURLService* model = | 1229 TemplateURLService* model = |
| 1225 TemplateURLServiceFactory::GetForProfile(browser()->profile()); | 1230 TemplateURLServiceFactory::GetForProfile(browser()->profile()); |
| 1226 model->SetUserSelectedDefaultSearchProvider(NULL); | 1231 model->SetUserSelectedDefaultSearchProvider(NULL); |
| 1227 | 1232 |
| 1228 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); | 1233 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); |
| 1229 chrome::FocusLocationBar(browser()); | 1234 chrome::FocusLocationBar(browser()); |
| 1230 | 1235 |
| 1231 OmniboxView* omnibox_view = NULL; | 1236 OmniboxView* omnibox_view = NULL; |
| (...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1998 | 2003 |
| 1999 // Now Shift+Right should do nothing, and Shift+Left should reduce. | 2004 // Now Shift+Right should do nothing, and Shift+Left should reduce. |
| 2000 // At the end, so Shift+Right should do nothing. | 2005 // At the end, so Shift+Right should do nothing. |
| 2001 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN)); | 2006 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, ui::EF_SHIFT_DOWN)); |
| 2002 EXPECT_EQ(2u, GetSelectionSize(omnibox_view)); | 2007 EXPECT_EQ(2u, GetSelectionSize(omnibox_view)); |
| 2003 | 2008 |
| 2004 // And Left should reduce by one character. | 2009 // And Left should reduce by one character. |
| 2005 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN)); | 2010 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, ui::EF_SHIFT_DOWN)); |
| 2006 EXPECT_EQ(1u, GetSelectionSize(omnibox_view)); | 2011 EXPECT_EQ(1u, GetSelectionSize(omnibox_view)); |
| 2007 } | 2012 } |
| OLD | NEW |