Remove PlatformKeyboardEvent

third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "public/web/WebPluginContainer.h"
 
 #include "core/dom/Element.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameHost.h"
 #include "core/layout/LayoutObject.h"
 #include "core/page/Page.h"
 #include "platform/PlatformEvent.h"
-#include "platform/PlatformKeyboardEvent.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/graphics/paint/ForeignLayerDisplayItem.h"
 #include "platform/graphics/paint/PaintController.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
 #include "public/platform/WebCompositorSupport.h"
 #include "public/platform/WebLayer.h"
@@ skipping 312 matching lines @@
     TestPluginWebFrameClient pluginWebFrameClient; // Must outlive webViewHelper.
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "plugin_container.html", true, &pluginWebFrameClient);
     DCHECK(webView);
     webView->settings()->setPluginsEnabled(true);
     webView->resize(WebSize(300, 300));
     webView->updateAllLifecyclePhases();
     runPendingTasks();
 
     WebElement pluginContainerOneElement = webView->mainFrame()->document().getElementById(WebString::fromUTF8("translated-plugin"));
-    PlatformEvent::Modifiers modifierKey = static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | PlatformEvent::NumLockOn | PlatformEvent::IsLeft);
+    WebInputEvent::Modifiers modifierKey = static_cast<WebInputEvent::Modifiers>(WebInputEvent::ControlKey | WebInputEvent::NumLockOn | WebInputEvent::IsLeft);
 #if OS(MACOSX)
-    modifierKey = static_cast<PlatformEvent::Modifiers>(PlatformEvent::MetaKey | PlatformEvent::NumLockOn | PlatformEvent::IsLeft);
+    modifierKey = static_cast<WebInputEvent::Modifiers>(WebInputEvent::MetaKey | WebInputEvent::NumLockOn | WebInputEvent::IsLeft);
 #endif
-    PlatformKeyboardEvent platformKeyboardEventC(PlatformEvent::RawKeyDown, "", "", "", "", 67, 0, false, modifierKey, 0.0);
-    KeyboardEvent* keyEventC = KeyboardEvent::create(platformKeyboardEventC, 0);
+    WebKeyboardEvent webKeyboardEventC;
+    webKeyboardEventC.type = WebInputEvent::RawKeyDown;
+    webKeyboardEventC.modifiers = modifierKey;
+    webKeyboardEventC.windowsKeyCode = 67;
+    KeyboardEvent* keyEventC = KeyboardEvent::create(webKeyboardEventC, 0);
     toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventC);
     EXPECT_EQ(WebString("x"), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
 
     // Clearing |Clipboard::Buffer()|.
     Platform::current()->clipboard()->writePlainText(WebString(""));
     EXPECT_EQ(WebString(""), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
 
-    PlatformKeyboardEvent platformKeyboardEventInsert(PlatformEvent::RawKeyDown, "", "", "", "", 45, 0, false, modifierKey, 0.0);
-    KeyboardEvent* keyEventInsert = KeyboardEvent::create(platformKeyboardEventInsert, 0);
+    WebKeyboardEvent webKeyboardEventInsert;
+    webKeyboardEventInsert.type = WebInputEvent::RawKeyDown;
+    webKeyboardEventInsert.modifiers = modifierKey;
+    webKeyboardEventInsert.windowsKeyCode = 45;
+    KeyboardEvent* keyEventInsert = KeyboardEvent::create(webKeyboardEventInsert, 0);
     toWebPluginContainerImpl(pluginContainerOneElement.pluginContainer())->handleEvent(keyEventInsert);
     EXPECT_EQ(WebString("x"), Platform::current()->clipboard()->readPlainText(WebClipboard::Buffer()));
 }
 
 // A class to facilitate testing that events are correctly received by plugins.
 class EventTestPlugin : public FakeWebPlugin {
 public:
     EventTestPlugin(WebFrame* frame, const WebPluginParams& params)
         : FakeWebPlugin(frame, params)
         , m_lastEventType(WebInputEvent::Undefined)
@@ skipping 285 matching lines @@
     runPendingTasks();
 
     WebElement pluginContainerOneElement = webView->mainFrame()->document().getElementById(WebString::fromUTF8("translated-plugin"));
     pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true);
 
     runPendingTasks();
     EXPECT_TRUE(webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers(EventHandlerRegistry::WheelEventBlocking));
 }
 
 } // namespace blink