services/ui: Revert CLs that broke Windows.

ui/views/mus/native_widget_mus.h

Index: ui/views/mus/native_widget_mus.h
diff --git a/ui/views/mus/native_widget_mus.h b/ui/views/mus/native_widget_mus.h
index 2e50183eeb6e711085c4807a1523a922a807da34..3634de419ebd58c1a188e3f72cd8f025e67fed11 100644
--- a/ui/views/mus/native_widget_mus.h
+++ b/ui/views/mus/native_widget_mus.h
@@ -33,6 +33,7 @@ class Window;
 }
 
 namespace ui {
+class BitmapUploader;
 class Window;
 class WindowTreeClient;
 namespace mojom {
@@ -41,8 +42,13 @@ enum class EventResult;
 }
 }
 
+namespace shell {
+class Connector;
+}
+
 namespace ui {
 class Event;
+class ViewProp;
 }
 
 namespace wm {
@@ -67,6 +73,7 @@ class VIEWS_MUS_EXPORT NativeWidgetMus
       public NON_EXPORTED_BASE(ui::InputEventHandler) {
  public:
   NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
+                  shell::Connector* connector,
                   ui::Window* window,
                   ui::mojom::SurfaceType surface_type);
   ~NativeWidgetMus() override;
@@ -273,6 +280,10 @@ class VIEWS_MUS_EXPORT NativeWidgetMus
   std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
   std::unique_ptr<wm::CursorManager> cursor_manager_;
 
+  // Bitmap management.
+  std::unique_ptr<ui::BitmapUploader> bitmap_uploader_;
+  std::unique_ptr<ui::ViewProp> prop_;
+
   base::WeakPtrFactory<NativeWidgetMus> close_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetMus);