Revert "Expose DPI helper functions for Runner apps to use (flutter#16313)"

This reverts commit bac380c.

Author: NoamDev

ci/licenses_golden/licenses_flutter

@@ -1116,9 +1116,6 @@ FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flu
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
-FILE: ../../../flutter/shell/platform/windows/dpi_utils.cc
-FILE: ../../../flutter/shell/platform/windows/dpi_utils.h
-FILE: ../../../flutter/shell/platform/windows/dpi_utils_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/flutter_windows.cc
 FILE: ../../../flutter/shell/platform/windows/key_event_handler.cc
 FILE: ../../../flutter/shell/platform/windows/key_event_handler.h
@@ -1128,9 +1125,10 @@ FILE: ../../../flutter/shell/platform/windows/platform_handler.h
 FILE: ../../../flutter/shell/platform/windows/public/flutter_windows.h
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.cc
 FILE: ../../../flutter/shell/platform/windows/text_input_plugin.h
+FILE: ../../../flutter/shell/platform/windows/win32_dpi_helper.cc
+FILE: ../../../flutter/shell/platform/windows/win32_dpi_helper.h
 FILE: ../../../flutter/shell/platform/windows/win32_flutter_window.cc
 FILE: ../../../flutter/shell/platform/windows/win32_flutter_window.h
-FILE: ../../../flutter/shell/platform/windows/win32_flutter_window_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/win32_task_runner.cc
 FILE: ../../../flutter/shell/platform/windows/win32_task_runner.h
 FILE: ../../../flutter/shell/platform/windows/win32_window.cc

shell/platform/windows/BUILD.gn

@@ -41,8 +41,6 @@ source_set("flutter_windows_source") {
   sources = [
     "angle_surface_manager.cc",
     "angle_surface_manager.h",
-    "dpi_utils.cc",
-    "dpi_utils.h",
     "flutter_windows.cc",
     "key_event_handler.cc",
     "key_event_handler.h",
@@ -51,6 +49,8 @@ source_set("flutter_windows_source") {
     "platform_handler.h",
     "text_input_plugin.cc",
     "text_input_plugin.h",
+    "win32_dpi_helper.cc",
+    "win32_dpi_helper.h",
     "win32_flutter_window.cc",
     "win32_flutter_window.h",
     "win32_task_runner.cc",
@@ -109,12 +109,8 @@ executable("flutter_windows_unittests") {
   testonly = true
 
   sources = [
-    "dpi_utils_unittests.cc",
     "testing/win32_flutter_window_test.cc",
     "testing/win32_flutter_window_test.h",
-    "testing/win32_window_test.cc",
-    "testing/win32_window_test.h",
-    "win32_flutter_window_unittests.cc",
     "win32_window_unittests.cc",
   ]
 

shell/platform/windows/dpi_utils.cc

@@ -15,7 +15,6 @@
 #include "flutter/shell/platform/common/cpp/client_wrapper/include/flutter/plugin_registrar.h"
 #include "flutter/shell/platform/common/cpp/incoming_message_dispatcher.h"
 #include "flutter/shell/platform/embedder/embedder.h"
-#include "flutter/shell/platform/windows/dpi_utils.h"
 #include "flutter/shell/platform/windows/key_event_handler.h"
 #include "flutter/shell/platform/windows/keyboard_hook_handler.h"
 #include "flutter/shell/platform/windows/platform_handler.h"
@@ -183,14 +182,6 @@ HWND FlutterDesktopViewGetHWND(FlutterDesktopViewRef view) {
   return view->window->GetWindowHandle();
 }
 
-UINT FlutterDesktopGetDpiForHWND(HWND hwnd) {
-  return flutter::GetDpiForHWND(hwnd);
-}
-
-UINT FlutterDesktopGetDpiForMonitor(HMONITOR monitor) {
-  return flutter::GetDpiForMonitor(monitor);
-}
-
 FlutterDesktopEngineRef FlutterDesktopRunEngine(const char* assets_path,
                                                 const char* icu_data_path,
                                                 const char** arguments,

shell/platform/windows/dpi_utils.h

@@ -77,15 +77,6 @@ FlutterDesktopProcessMessages(FlutterDesktopViewControllerRef controller);
 // Return backing HWND for manipulation in host application.
 FLUTTER_EXPORT HWND FlutterDesktopViewGetHWND(FlutterDesktopViewRef view);
 
-// Gets the DPI for a given |hwnd|, depending on the supported APIs per
-// windows version and DPI awareness mode. If nullptr is passed, returns the DPI
-// of the primary monitor.
-FLUTTER_EXPORT UINT FlutterDesktopGetDpiForHWND(HWND hwnd);
-
-// Gets the DPI for a given |monitor|. If the API is not available, a default
-// DPI of 96 is returned.
-FLUTTER_EXPORT UINT FlutterDesktopGetDpiForMonitor(HMONITOR monitor);
-
 // Runs an instance of a headless Flutter engine.
 //
 // The |assets_path| is the path to the flutter_assets folder for the Flutter

shell/platform/windows/dpi_utils_unittests.cc

@@ -4,20 +4,17 @@
 
 #include <windowsx.h>
 
+#include "flutter/fml/macros.h"
 #include "flutter/shell/platform/windows/win32_flutter_window.h"
 
 namespace flutter {
 namespace testing {
 
-/// Test class for Win32FlutterWindow.
 class Win32FlutterWindowTest : public Win32FlutterWindow {
  public:
   Win32FlutterWindowTest(int width, int height);
-  virtual ~Win32FlutterWindowTest();
 
-  // Prevent copying.
-  Win32FlutterWindowTest(Win32FlutterWindowTest const&) = delete;
-  Win32FlutterWindowTest& operator=(Win32FlutterWindowTest const&) = delete;
+  virtual ~Win32FlutterWindowTest();
 
   // |Win32Window|
   void OnFontChange() override;
@@ -26,6 +23,8 @@ class Win32FlutterWindowTest : public Win32FlutterWindow {
 
  private:
   bool on_font_change_called_ = false;
+
+  FML_DISALLOW_COPY_AND_ASSIGN(Win32FlutterWindowTest);
 };
 
 }  // namespace testing