Make wm_flow_init work with gn

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 2ffb1e5fd0f737e94ad7910691ca84bb01ee0e46..dbe4614f42422842cdf0ea4280b75d5d299278f1 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -558,21 +558,22 @@
           ],
         },
         {
-          # GN version: //mojo/views
+          # GN version: //mojo/views:views
           'target_name': 'mojo_views_support',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../skia/skia.gyp:skia',
             '../third_party/icu/icu.gyp:icui18n',
             '../third_party/icu/icu.gyp:icuuc',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
+            '../ui/gfx/gfx.gyp:gfx',
             '../ui/views/views.gyp:views',
             '../ui/wm/wm.gyp:wm',
             'mojo_aura_support',
-            'mojo_views_support_internal',
             'mojo_view_manager_lib',
             'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
           ],
@@ -586,29 +587,6 @@
           ],
         },
         {
-          # GN version: //mojo/views:views_internal
-          'target_name': 'mojo_views_support_internal',
-          'type': '<(component)',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-            '../skia/skia.gyp:skia',
-            '../third_party/icu/icu.gyp:icui18n',
-            '../third_party/icu/icu.gyp:icuuc',
-            '../ui/base/ui_base.gyp:ui_base',
-            '../ui/gfx/gfx.gyp:gfx',
-          ],
-          'sources': [
-            'views/mojo_views_export.h',
-            'views/views_init_internal.cc',
-            'views/views_init_internal.h',
-          ],
-          'defines': [
-            'MOJO_VIEWS_IMPLEMENTATION',
-          ],
-        },
-        {
           # GN version: //mojo/services/public/cpp/view_manager/lib:run_unittests
           'target_name': 'mojo_view_manager_run_unittests',
           'type': 'static_library',