Create ash media delegate earlier during ash shell initialization

ash/shell.cc

 // Copyright (c) 2012 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/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 788 matching lines @@
 #endif
 
   // Needs to happen right before |instance_| is reset.
   wm_shell_.reset();
 
   DCHECK(instance_ == this);
   instance_ = nullptr;
 }
 
 void Shell::Init(const ShellInitParams& init_params) {
+  wm_shell_->Initialize();
+
   in_mus_ = init_params.in_mus;

[msw, 2016/07/14 22:49:34]

aside: hopefully WmShell Init delegates won't rely on this, etc. We may
encounter ordering dependency issues like that, as you noted in the prior CL,
hopefully they'll make themselves apparent.

[James Cook, 2016/07/14 22:52:51]

Yeah, all this startup ordering stuff is hard. I think in the medium-term
ash::Shell::in_mus_ will move into WmShell, which will help a little.

 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   DCHECK(in_mus_) << "linux desktop does not support ash.";
 #endif
 
   scoped_overview_animation_settings_factory_.reset(
       new ScopedOverviewAnimationSettingsFactoryAura);
   window_positioner_.reset(new WindowPositioner(wm_shell_.get()));
 
   if (!in_mus_) {
@@ skipping 190 matching lines @@
   desktop_background_controller_.reset(
       new DesktopBackgroundController(blocking_pool_));
   user_wallpaper_delegate_.reset(
       wm_shell_->delegate()->CreateUserWallpaperDelegate());
 
   session_state_delegate_.reset(
       wm_shell_->delegate()->CreateSessionStateDelegate());
   accessibility_delegate_.reset(
       wm_shell_->delegate()->CreateAccessibilityDelegate());
   new_window_delegate_.reset(wm_shell_->delegate()->CreateNewWindowDelegate());
-  wm_shell_->SetMediaDelegate(
-      base::WrapUnique(wm_shell_->delegate()->CreateMediaDelegate()));
   pointer_watcher_delegate_ =
       wm_shell_->delegate()->CreatePointerWatcherDelegate();
 
   resize_shadow_controller_.reset(new ResizeShadowController());
   shadow_controller_.reset(new ::wm::ShadowController(activation_client_));
 
   wm_shell_->SetSystemTrayDelegate(
       base::WrapUnique(wm_shell_->delegate()->CreateSystemTrayDelegate()));
 
   locale_notification_controller_.reset(new LocaleNotificationController);
@@ skipping 136 matching lines @@
 
 void Shell::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   if (gained_active)
     target_root_window_ = gained_active->GetRootWindow();
 }
 
 }  // namespace ash