summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/omnibox
diff options
context:
space:
mode:
authorncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 03:14:54 +0000
committerncj674@motorola.com <ncj674@motorola.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-04 03:14:54 +0000
commit3757776a93f410667f88f18534f07be663d0bfcf (patch)
treedb797ddf9fbf7e6844ce345524defd774abc406b /chrome/browser/ui/omnibox
parent6bc04fd88b32683414c489b399ae716cb9b2b556 (diff)
downloadchromium_src-3757776a93f410667f88f18534f07be663d0bfcf.zip
chromium_src-3757776a93f410667f88f18534f07be663d0bfcf.tar.gz
chromium_src-3757776a93f410667f88f18534f07be663d0bfcf.tar.bz2
Strip invalid characters (line breaks, tabs), javascript:schemes from the copied text while pasting text, droping text and creating right click popup for omnibox.
BUG=82181, 103703 TEST=Copy a string with line breaks "\n" or tabs "\t". Then right click on omnibox. Chromium should not trigger DCHECKS. Review URL: http://codereview.chromium.org/8702002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox')
-rw-r--r--chrome/browser/ui/omnibox/omnibox_view_browsertest.cc14
1 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 6c355bc..6ad48ab 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -757,20 +757,10 @@ class OmniboxViewTest : public InProcessBrowserTest,
ASSERT_EQ(text, omnibox_view->model()->keyword());
ASSERT_EQ(text, omnibox_view->GetText());
- // Keyword shouldn't be accepted by pasting.
- // Simulate pasting a whitespace to the end of content.
- omnibox_view->OnBeforePossibleChange();
- omnibox_view->model()->on_paste();
- omnibox_view->SetWindowTextAndCaretPos(
- text + char16(' '), text.length() + 1);
- omnibox_view->OnAfterPossibleChange();
- // Should be still in keyword hint mode.
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
- ASSERT_EQ(text + char16(' '), omnibox_view->GetText());
-
// Keyword shouldn't be accepted by pressing space with a trailing
// whitespace.
+ omnibox_view->SetWindowTextAndCaretPos(
+ text + char16(' '), text.length() + 1);
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
ASSERT_EQ(text, omnibox_view->model()->keyword());