Move Mus into chrome's process when running with --mus.

services/ui/display/screen_manager_forwarding.h

Index: services/ui/display/screen_manager_forwarding.h
diff --git a/services/ui/display/screen_manager_forwarding.h b/services/ui/display/screen_manager_forwarding.h
index 204cc50720b8a432d5ce547583fd9119a5f25ee3..b897e04c3a3a7e5f45005fe75670c42e22cf9671 100644
--- a/services/ui/display/screen_manager_forwarding.h
+++ b/services/ui/display/screen_manager_forwarding.h
@@ -30,7 +30,9 @@ class ScreenManagerForwarding : public ScreenManager,
                                 public NativeDisplayObserver,
                                 public mojom::NativeDisplayDelegate {
  public:
-  ScreenManagerForwarding();
+  // |in_process|  is true if the UI Service runs inside WM's process, false if

[sky, 2017/06/27 19:58:56]

optional: The boolean parameter isn't particularly obvious. Use an enum.

[mfomitchev, 2017/07/11 21:46:59]

Done.

+  // it runs inside its own process.
+  ScreenManagerForwarding(bool in_process);

[sky, 2017/06/27 19:58:56]

explicit

[mfomitchev, 2017/07/11 21:46:59]

Done.

   ~ScreenManagerForwarding() override;
 
   // ScreenManager:
@@ -82,6 +84,9 @@ class ScreenManagerForwarding : public ScreenManager,
       const mojom::NativeDisplayDelegate::ConfigureCallback& callback,
       bool status);
 
+  // True if the UI Service runs inside WM's process, false if it runs inside
+  // its own process.
+  bool in_process_;

[sky, 2017/06/27 19:58:56]

const.

[mfomitchev, 2017/07/11 21:46:59]

Done.

   std::unique_ptr<display::ScreenBase> screen_;
   mojo::Binding<mojom::NativeDisplayDelegate> binding_;
   mojom::NativeDisplayObserverPtr observer_;