Merge 227483 "Views Textfield/Omnibox: Do not paste on Ctrl+Alt[..."

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1565 matching lines @@
 #endif
   omnibox_view->CloseOmniboxPopup();
   EXPECT_FALSE(popup_model->IsOpen());
 
   // Pasting amid text should yield the expected text and re-open the popup.
   omnibox_view->SetWindowTextAndCaretPos(ASCIIToUTF16("abcd"), 2, false, false);
   SetClipboardText(ASCIIToUTF16("123"));
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, kCtrlOrCmdMask));
   EXPECT_EQ(ASCIIToUTF16("ab123cd"), omnibox_view->GetText());
   EXPECT_TRUE(popup_model->IsOpen());
+
+  // Ctrl/Cmd+Alt+V should not paste.
+  ASSERT_NO_FATAL_FAILURE(
+      SendKey(ui::VKEY_V, kCtrlOrCmdMask | ui::EF_ALT_DOWN));
+  EXPECT_EQ(ASCIIToUTF16("ab123cd"), omnibox_view->GetText());
+  // TODO(msw): Test that AltGr+V does not paste.
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, CopyURLToClipboard) {
   // Set permanent text thus making sure that omnibox treats 'google.com'
   // as URL (not as ordinary user input).
   TestToolbarModel* test_toolbar_model = new TestToolbarModel;
   scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
   test_toolbar_model->set_text(ASCIIToUTF16("http://www.google.com/"));
   browser()->swap_toolbar_models(&toolbar_model);
   OmniboxView* omnibox_view = NULL;
@@ skipping 256 matching lines @@
   omnibox_view->Update();
   EXPECT_EQ(url_c, omnibox_view->GetText());
 }
 
 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, InputResetsSearchTermReplacement) {
   browser()->toolbar_model()->set_search_term_replacement_enabled(false);
   chrome::FocusLocationBar(browser());
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0));
   EXPECT_TRUE(browser()->toolbar_model()->search_term_replacement_enabled());
 }