Remove ui::KeycodeConverter::CodeToNativeKeycode().

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

 // Copyright 2013 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 "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 27 matching lines @@
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 
 using content::WebContents;
 using content::NativeWebKeyboardEvent;
 
 namespace {
 
 // Counts the number of RenderViewHosts created.
 class CountRenderViewHosts : public content::NotificationObserver {
  public:
@@ skipping 572 matching lines @@
   GURL url(embedded_test_server()->GetURL(
       "/popup_blocker/popup-simulated-click-on-anchor.html"));
   ui_test_utils::NavigateToURL(browser(), url);
 
   content::WindowedNotificationObserver wait_for_new_tab(
       chrome::NOTIFICATION_TAB_ADDED,
       content::NotificationService::AllSources());
 
 #if defined(OS_MACOSX)
   int modifiers = blink::WebInputEvent::MetaKey;
-  InjectRawKeyEvent(tab, blink::WebInputEvent::RawKeyDown, ui::VKEY_COMMAND,
-                    ui::KeycodeConverter::CodeToNativeKeycode("OSLeft"),
-                    modifiers);
+  InjectRawKeyEvent(
+      tab, blink::WebInputEvent::RawKeyDown, ui::VKEY_COMMAND,
+      ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::OS_LEFT),
+      modifiers);
 #else
   int modifiers = blink::WebInputEvent::ControlKey;
-  InjectRawKeyEvent(tab, blink::WebInputEvent::RawKeyDown, ui::VKEY_CONTROL,
-                    ui::KeycodeConverter::CodeToNativeKeycode("ControlLeft"),
-                    modifiers);
+  InjectRawKeyEvent(
+      tab, blink::WebInputEvent::RawKeyDown, ui::VKEY_CONTROL,
+      ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT),
+      modifiers);
 #endif
 
   InjectRawKeyEvent(tab, blink::WebInputEvent::RawKeyDown, ui::VKEY_RETURN,
-                    ui::KeycodeConverter::CodeToNativeKeycode(NULL), modifiers);
+                    ui::KeycodeConverter::InvalidNativeKeycode(), modifiers);
 
   InjectRawKeyEvent(tab, blink::WebInputEvent::Char, ui::VKEY_RETURN,
-                    ui::KeycodeConverter::CodeToNativeKeycode(NULL), modifiers);
+                    ui::KeycodeConverter::InvalidNativeKeycode(), modifiers);
 
   InjectRawKeyEvent(tab, blink::WebInputEvent::KeyUp, ui::VKEY_RETURN,
-                    ui::KeycodeConverter::CodeToNativeKeycode(NULL), modifiers);
+                    ui::KeycodeConverter::InvalidNativeKeycode(), modifiers);
 
 #if defined(OS_MACOSX)
-  InjectRawKeyEvent(tab, blink::WebInputEvent::KeyUp, ui::VKEY_COMMAND,
-                    ui::KeycodeConverter::CodeToNativeKeycode("OSLeft"),
-                    modifiers);
+  InjectRawKeyEvent(
+      tab, blink::WebInputEvent::KeyUp, ui::VKEY_COMMAND,
+      ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::OS_LEFT),
+      modifiers);
 #else
-  InjectRawKeyEvent(tab, blink::WebInputEvent::KeyUp, ui::VKEY_CONTROL,
-                    ui::KeycodeConverter::CodeToNativeKeycode("ControlLeft"),
-                    modifiers);
+  InjectRawKeyEvent(
+      tab, blink::WebInputEvent::KeyUp, ui::VKEY_CONTROL,
+      ui::KeycodeConverter::DomCodeToNativeKeycode(ui::DomCode::CONTROL_LEFT),
+      modifiers);
 #endif
-
   wait_for_new_tab.Wait();
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 // Tests that the tapping gesture with cntl/cmd key on a link open the
@@ skipping 19 matching lines @@
   wait_for_new_tab.Wait();
 
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
                                         browser()->host_desktop_type()));
   ASSERT_EQ(2, browser()->tab_strip_model()->count());
   // Check that we create the background tab.
   ASSERT_EQ(0, browser()->tab_strip_model()->active_index());
 }
 
 }  // namespace