chromeos: Promotes more from WmShell to Shell

ash/mus/window_manager.cc

 // Copyright 2015 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/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 177 matching lines @@
       RootWindowController::RootWindowType::PRIMARY);
 }
 
 void WindowManager::CreateShell(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
   DCHECK(!created_shell_);
   created_shell_ = true;
   ShellInitParams init_params;
   WmShellMus* wm_shell = new WmShellMus(
       WmWindow::Get(window_tree_host->window()),
-      shell_delegate_for_test_ ? std::move(shell_delegate_for_test_)
-                               : base::MakeUnique<ShellDelegateMus>(connector_),
       this, pointer_watcher_event_router_.get(),
       create_session_state_delegate_stub_for_test_);
+  init_params.delegate = shell_delegate_for_test_

[James Cook, 2017/03/11 00:40:43]

Can you add a comment by ShellInitParams::delegate that Shell takes ownership?
Or make it a unique_ptr<>? It took me a while to re-understand ownership here.

[sky, 2017/03/13 15:23:19]

Done.

+                             ? shell_delegate_for_test_.release()
+                             : new ShellDelegateMus(connector_);
   init_params.primary_window_tree_host = window_tree_host.release();
   init_params.wm_shell = wm_shell;
   init_params.blocking_pool = blocking_pool_.get();
   Shell::CreateInstance(init_params);
 }
 
 void WindowManager::CreateAndRegisterRootWindowController(
     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
     const display::Display& display,
     RootWindowController::RootWindowType root_window_type) {
@@ skipping 243 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::GetInstance()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash