views/mus: Have explicit ownership of views::WindowManagerConnection.

content/browser/browser_main_loop.h

Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 9bd8fa9ec633af854448295eb5613b792a776ee6..c39ae70bd138d9bcfdb16b2591777fa192bd4f6d 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -64,6 +64,12 @@ class ClientNativePixmapFactory;
 }  // namespace ui
 #endif
 
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)

[Ben Goodger (Google), 2016/05/31 23:23:39]

Are you sure MOJO_SHELL_CLIENT is defined in all the places that #include this
header?

[sadrul, 2016/05/31 23:43:51]

Oh, nice catch! I hadn't thought about that.

Looks like browser_main_loop.h is included from code only in //content/browser,
and one file outside of that: //content/public/browser/media_device_id.cc. For
code in //content/browser/, MOJO_SHELL_CLIENT is defined. But it wasn't defined
for media_device_id.cc. I have added that define (through gn config
//content/public/common:mojo_shell_client). That should take care of that. PTAL

+namespace views {
+class WindowManagerConnection;
+}
+#endif
+
 namespace content {
 class BrowserMainParts;
 class BrowserOnlineStateObserver;
@@ -279,6 +285,10 @@ class CONTENT_EXPORT BrowserMainLoop {
   std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
 #endif
 
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
+  std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
+#endif
+
   std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
   std::unique_ptr<MediaStreamManager> media_stream_manager_;
   std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;