Changes ownership of WindowTreeClient

services/ui/public/cpp/window_tree_host_factory.h

Index: services/ui/public/cpp/window_tree_host_factory.h
diff --git a/services/ui/public/cpp/window_tree_host_factory.h b/services/ui/public/cpp/window_tree_host_factory.h
index 2f638865b8359fb7fd4cf3e241309767ed0f0f51..a3f7ee18eb73ff6cc2c1c0eb06b759c453461307 100644
--- a/services/ui/public/cpp/window_tree_host_factory.h
+++ b/services/ui/public/cpp/window_tree_host_factory.h
@@ -7,6 +7,7 @@
 
 #include <memory>
 
+#include "base/compiler_specific.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
@@ -18,19 +19,22 @@ class Connector;
 namespace ui {
 
 class WindowManagerDelegate;
+class WindowTreeClient;
 class WindowTreeClientDelegate;
 
 // The following create a new window tree host. Supply a |factory| if you have
 // already connected to mus, otherwise supply |shell|, which contacts mus and
 // obtains a WindowTreeHostFactory.
-void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory,
-                          WindowTreeClientDelegate* delegate,
-                          mojom::WindowTreeHostPtr* host,
-                          WindowManagerDelegate* window_manager_delegate);
-void CreateWindowTreeHost(shell::Connector* connector,
-                          WindowTreeClientDelegate* delegate,
-                          mojom::WindowTreeHostPtr* host,
-                          WindowManagerDelegate* window_manager_delegate);
+WARN_UNUSED_RESULT std::unique_ptr<WindowTreeClient> CreateWindowTreeHost(

[sadrul, 2016/09/02 17:04:15]

WARN_UNUSED_RESULT seem to be normally used at the end, although it looks like
we have both styles in our code.

[sky, 2016/09/06 17:15:42]

I'm going to remove it. I mostly did it to ensure I updated all sites.

+    mojom::WindowTreeHostFactory* factory,
+    WindowTreeClientDelegate* delegate,
+    mojom::WindowTreeHostPtr* host,
+    WindowManagerDelegate* window_manager_delegate);
+WARN_UNUSED_RESULT std::unique_ptr<WindowTreeClient> CreateWindowTreeHost(
+    shell::Connector* connector,
+    WindowTreeClientDelegate* delegate,
+    mojom::WindowTreeHostPtr* host,
+    WindowManagerDelegate* window_manager_delegate);
 
 }  // namespace ui