Some cleanup

Author: gspencergoog

shell/platform/windows/flutter_windows_engine_unittests.cc

@@ -102,7 +102,7 @@ TEST(FlutterWindowsEngine, SendPlatformMessageWithoutResponse) {
   const char* channel = "test";
   const std::vector<uint8_t> test_message = {1, 2, 3, 4};
 
-  // Without a responses, SendPlatformMessage should be a simple pass-through.
+  // Without a response, SendPlatformMessage should be a simple pass-through.
   bool called = false;
   modifier.embedder_api().SendPlatformMessage = MOCK_ENGINE_PROC(
       SendPlatformMessage, ([&called, test_message](auto engine, auto message) {

shell/platform/windows/flutter_windows_view.h

@@ -35,14 +35,14 @@ inline constexpr uint32_t kWindowFrameBufferID = 0;
 // view that works with win32 hwnds and Windows::UI::Composition visuals.
 class FlutterWindowsView : public WindowBindingHandlerDelegate {
  public:
-  // Creates a FlutterWindowsView with the given implementator of
+  // Creates a FlutterWindowsView with the given implementor of
   // WindowBindingHandler.
   //
   // In order for object to render Flutter content the SetEngine method must be
   // called with a valid FlutterWindowsEngine instance.
   FlutterWindowsView(std::unique_ptr<WindowBindingHandler> window_binding);
 
-  ~FlutterWindowsView();
+  virtual ~FlutterWindowsView();
 
   // Configures the window instance with an instance of a running Flutter
   // engine.

shell/platform/windows/testing/win32_flutter_window_test.h

@@ -5,10 +5,7 @@
 #ifndef FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_WIN32_FLUTTER_WINDOW_TEST_H_
 #define FLUTTER_SHELL_PLATFORM_WINDOWS_TESTING_WIN32_FLUTTER_WINDOW_TEST_H_
 
-#include <windowsx.h>
-
 #include "flutter/shell/platform/windows/win32_flutter_window.h"
-#include "gmock/gmock.h"
 
 namespace flutter {
 namespace testing {

shell/platform/windows/win32_window.cc

@@ -5,7 +5,6 @@
 #include "flutter/shell/platform/windows/win32_window.h"
 
 #include <cstring>
-#include <iostream>
 
 #include "win32_dpi_utils.h"
 

shell/platform/windows/win32_window_unittests.cc

@@ -9,6 +9,22 @@ using testing::_;
 
 namespace flutter {
 namespace testing {
+namespace {
+
+// Creates a valid Windows LPARAM for WM_KEYDOWN and WM_KEYUP from parameters
+// given.
+static LPARAM CreateKeyEventLparam(USHORT ScanCode,
+                                   bool extended = false,
+                                   USHORT RepeatCount = 1,
+                                   bool ContextCode = 0,
+                                   bool PreviousKeyState = 1,
+                                   bool TransitionState = 1) {
+  return ((LPARAM(TransitionState) << 31) | (LPARAM(PreviousKeyState) << 30) |
+          (LPARAM(ContextCode) << 29) | (LPARAM(extended ? 0x1 : 0x0) << 24) |
+          (LPARAM(ScanCode) << 16) | LPARAM(RepeatCount));
+}
+
+} // namespace
 
 TEST(MockWin32Window, CreateDestroy) {
   MockWin32Window window;
@@ -39,36 +55,25 @@ TEST(MockWin32Window, HorizontalScroll) {
   window.InjectWindowMessage(WM_MOUSEHWHEEL, MAKEWPARAM(0, scroll_amount), 0);
 }
 
-static LPARAM CreateKeyEventLparam(USHORT RepeatCount,
-                                   USHORT ScanCode,
-                                   bool extended,
-                                   bool ContextCode,
-                                   bool PreviousKeyState,
-                                   bool TransitionState) {
-  return ((LPARAM(TransitionState) << 31) | (LPARAM(PreviousKeyState) << 30) |
-          (LPARAM(ContextCode) << 29) | (LPARAM(extended ? 0x1 : 0x0) << 24) |
-          (LPARAM(ScanCode) << 16) | LPARAM(RepeatCount));
-}
-
 TEST(MockWin32Window, KeyDown) {
   MockWin32Window window;
   EXPECT_CALL(window, OnKey(_, _, _, _, _)).Times(1);
-  LPARAM lparam = CreateKeyEventLparam(1, 42, false, 0, 1, 1);
+  LPARAM lparam = CreateKeyEventLparam(42);
   // send a "Shift" key down event.
   window.InjectWindowMessage(WM_KEYDOWN, 16, lparam);
 }
 
 TEST(MockWin32Window, KeyUp) {
   MockWin32Window window;
   EXPECT_CALL(window, OnKey(_, _, _, _, _)).Times(1);
-  LPARAM lparam = CreateKeyEventLparam(1, 42, false, 0, 1, 1);
+  LPARAM lparam = CreateKeyEventLparam(42);
   // send a "Shift" key up event.
   window.InjectWindowMessage(WM_KEYUP, 16, lparam);
 }
 
 TEST(MockWin32Window, KeyDownPrintable) {
   MockWin32Window window;
-  LPARAM lparam = CreateKeyEventLparam(1, 30, false, 0, 1, 1);
+  LPARAM lparam = CreateKeyEventLparam(30);
   // OnKey shouldn't be called until the WM_CHAR message.
   EXPECT_CALL(window, OnKey(65, 30, WM_KEYDOWN, 65, false)).Times(0);
   // send a "A" key down event.