Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

Issue 2266083002: Avoid DCHECK failure for chrome:// URLs in autocomplete suggestions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changes for pkasting@ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/omnibox/browser/autocomplete_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "chrome/browser/search_engines/template_url_service_factory.h" 12 #include "chrome/browser/search_engines/template_url_service_factory.h"
13 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
14 #include "chrome/browser/ui/browser_commands.h" 14 #include "chrome/browser/ui/browser_commands.h"
15 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
16 #include "chrome/browser/ui/location_bar/location_bar.h" 16 #include "chrome/browser/ui/location_bar/location_bar.h"
17 #include "chrome/browser/ui/view_ids.h" 17 #include "chrome/browser/ui/view_ids.h"
18 #include "chrome/browser/ui/views/frame/browser_view.h" 18 #include "chrome/browser/ui/views/frame/browser_view.h"
19 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 19 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
21 #include "chrome/grit/generated_resources.h" 21 #include "chrome/grit/generated_resources.h"
22 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/interactive_test_utils.h" 23 #include "chrome/test/base/interactive_test_utils.h"
24 #include "components/omnibox/browser/omnibox_popup_model.h" 24 #include "components/omnibox/browser/omnibox_popup_model.h"
25 #include "components/omnibox/browser/test_scheme_classifier.h"
25 #include "ui/base/clipboard/clipboard.h" 26 #include "ui/base/clipboard/clipboard.h"
26 #include "ui/base/clipboard/scoped_clipboard_writer.h" 27 #include "ui/base/clipboard/scoped_clipboard_writer.h"
27 #include "ui/base/ime/input_method.h" 28 #include "ui/base/ime/input_method.h"
28 #include "ui/base/ime/text_input_client.h" 29 #include "ui/base/ime/text_input_client.h"
29 #include "ui/base/test/ui_controls.h" 30 #include "ui/base/test/ui_controls.h"
30 #include "ui/base/ui_base_switches.h" 31 #include "ui/base/ui_base_switches.h"
31 #include "ui/events/event_processor.h" 32 #include "ui/events/event_processor.h"
32 #include "ui/events/event_utils.h" 33 #include "ui/events/event_utils.h"
33 #include "ui/events/test/event_generator.h" 34 #include "ui/events/test/event_generator.h"
34 #include "ui/views/controls/textfield/textfield_test_api.h" 35 #include "ui/views/controls/textfield/textfield_test_api.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 AutocompleteResult& results = autocomplete_controller->result_; 311 AutocompleteResult& results = autocomplete_controller->result_;
311 ACMatches matches; 312 ACMatches matches;
312 AutocompleteMatch match; 313 AutocompleteMatch match;
313 match.destination_url = GURL("http://autocomplete-result/"); 314 match.destination_url = GURL("http://autocomplete-result/");
314 match.allowed_to_be_default_match = true; 315 match.allowed_to_be_default_match = true;
315 match.type = AutocompleteMatchType::HISTORY_TITLE; 316 match.type = AutocompleteMatchType::HISTORY_TITLE;
316 match.relevance = 500; 317 match.relevance = 500;
317 matches.push_back(match); 318 matches.push_back(match);
318 match.destination_url = GURL("http://autocomplete-result2/"); 319 match.destination_url = GURL("http://autocomplete-result2/");
319 matches.push_back(match); 320 matches.push_back(match);
320 results.AppendMatches(AutocompleteInput(), matches); 321 const AutocompleteInput input(
322 base::ASCIIToUTF16("a"), base::string16::npos, std::string(), GURL(),
323 metrics::OmniboxEventProto::INVALID_SPEC, false, false, true, true, false,
324 TestSchemeClassifier());
325 results.AppendMatches(input, matches);
321 results.SortAndCull( 326 results.SortAndCull(
322 AutocompleteInput(), 327 input, TemplateURLServiceFactory::GetForProfile(browser()->profile()));
323 TemplateURLServiceFactory::GetForProfile(browser()->profile()));
324 328
325 // The omnibox popup should open with suggestions displayed. 329 // The omnibox popup should open with suggestions displayed.
326 omnibox_view->model()->popup_model()->OnResultChanged(); 330 omnibox_view->model()->popup_model()->OnResultChanged();
327 EXPECT_TRUE(omnibox_view->model()->popup_model()->IsOpen()); 331 EXPECT_TRUE(omnibox_view->model()->popup_model()->IsOpen());
328 332
329 // The omnibox text should be selected. 333 // The omnibox text should be selected.
330 EXPECT_TRUE(omnibox_view->IsSelectAll()); 334 EXPECT_TRUE(omnibox_view->IsSelectAll());
331 335
332 // Simulate a mouse click before dragging the mouse. 336 // Simulate a mouse click before dragging the mouse.
333 gfx::Point point(omnibox_view_views->x(), omnibox_view_views->y()); 337 gfx::Point point(omnibox_view_views->x(), omnibox_view_views->y());
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) { 385 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) {
382 chrome::FocusLocationBar(browser()); 386 chrome::FocusLocationBar(browser());
383 OmniboxView* view = NULL; 387 OmniboxView* view = NULL;
384 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); 388 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view));
385 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); 389 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view);
386 ui::InputMethod* input_method = 390 ui::InputMethod* input_method =
387 omnibox_view_views->GetWidget()->GetInputMethod(); 391 omnibox_view_views->GetWidget()->GetInputMethod();
388 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views), 392 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views),
389 input_method->GetTextInputClient()); 393 input_method->GetTextInputClient());
390 } 394 }
OLDNEW
« no previous file with comments | « no previous file | components/omnibox/browser/autocomplete_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698