Create ash media delegate earlier during ash shell initialization

ash/common/wm_shell.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/common/wm_shell.h"
 
 #include <utility>
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/keyboard/keyboard_ui.h"
@@ skipping 24 matching lines @@
 // static
 void WmShell::Set(WmShell* instance) {
   instance_ = instance;
 }
 
 // static
 WmShell* WmShell::Get() {
   return instance_;
 }
 
+void WmShell::Initialize() {
+  // Some delegates access WmShell during their construction. Create them here
+  // instead of the WmShell constructor.
+  media_delegate_.reset(delegate_->CreateMediaDelegate());
+}
+
 void WmShell::OnMaximizeModeStarted() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeStarted());
 }
 
 void WmShell::OnMaximizeModeEnded() {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_, OnMaximizeModeEnded());
 }
 
 void WmShell::NotifyPinnedStateChanged(WmWindow* pinned_window) {
   FOR_EACH_OBSERVER(ShellObserver, shell_observers_,
@@ skipping 43 matching lines @@
       }
     }
   }
   return false;
 }
 
 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
   keyboard_ui_ = std::move(keyboard_ui);
 }
 
-void WmShell::SetMediaDelegate(std::unique_ptr<MediaDelegate> delegate) {
-  media_delegate_ = std::move(delegate);
-}
-
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
   DCHECK(delegate);
   DCHECK(!system_tray_delegate_);
   // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
   system_tray_delegate_ = std::move(delegate);
   system_tray_delegate_->Initialize();
 #if defined(OS_CHROMEOS)
   logout_confirmation_controller_.reset(new LogoutConfirmationController(
       base::Bind(&SystemTrayDelegate::SignOut,
@@ skipping 23 matching lines @@
 
 void WmShell::CreateMruWindowTracker() {
   mru_window_tracker_.reset(new MruWindowTracker);
 }
 
 void WmShell::DeleteMruWindowTracker() {
   mru_window_tracker_.reset();
 }
 
 }  // namespace ash