Two small ash fixes.

ash/mus/root_window_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 21 matching lines @@
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_tree_client.h"
-#include "services/ui/public/cpp/window_tree_host_factory.h"
 #include "ui/display/display_list.h"
 #include "ui/display/screen_base.h"
 
 using ash::mojom::Container;
 
 namespace ash {
 namespace mus {
 
 RootWindowController::RootWindowController(WindowManager* window_manager,
                                            ui::Window* root,
@@ skipping 132 matching lines @@
       GetWindowByShellWindowId(kShellWindowId_LockScreenContainer);
   layout_managers_[lock_screen_container->mus_window()].reset(
       new ScreenlockLayout(lock_screen_container->mus_window()));
 
   // Creating the shelf also creates the status area and both layout managers.
   wm_shelf_.reset(new WmShelfMus(wm_root_window_controller_->GetWindow()));
 }
 
 }  // namespace mus
 }  // namespace ash