Check internal display RootWindow before getting the compositor.

ash/wallpaper/wallpaper_controller.cc

Index: ash/wallpaper/wallpaper_controller.cc
diff --git a/ash/wallpaper/wallpaper_controller.cc b/ash/wallpaper/wallpaper_controller.cc
index 2991f51db0545ad44fd7796927d02d8112a4ec9a..8ebe54a50af035d8f0498f9cb2f0365d70695a1b 100644
--- a/ash/wallpaper/wallpaper_controller.cc
+++ b/ash/wallpaper/wallpaper_controller.cc
@@ -416,14 +416,15 @@ bool WallpaperController::MoveToUnlockedContainer() {
 
 void WallpaperController::GetInternalDisplayCompositorLock() {
   if (display::Display::HasInternalDisplay()) {
-    compositor_lock_ =
-        Shell::Get()
-            ->window_tree_host_manager()
-            ->GetRootWindowForDisplayId(display::Display::InternalDisplayId())
-            ->layer()
-            ->GetCompositor()
-            ->GetCompositorLock(this, base::TimeDelta::FromMilliseconds(
-                                          kCompositorLockTimeoutMs));
+    aura::Window* root_window =
+        Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
+            display::Display::InternalDisplayId());

[oshima, 2017/05/11 21:03:45]

can you use ShellPort::GetRootWindowForDisplayId ?

[wutao, 2017/05/11 21:34:35]

sg.
BTW, It seems the code wraps aura::Window with WmWindow and then I need to get
aura::Window again. 

[sadrul, 2017/05/11 23:41:12]

Actually, we are trying to get rid of WmWindow. So directly using aura::Window
here is better.

https://bugs.chromium.org/p/chromium/issues/detail?id=671246

+    if (root_window) {
+      compositor_lock_ =
+          root_window->layer()->GetCompositor()->GetCompositorLock(
+              this,
+              base::TimeDelta::FromMilliseconds(kCompositorLockTimeoutMs));
+    }
   }
 }