mash: Move SystemTrayDelegate ownership to WmShell

chrome/browser/ui/ash/vpn_delegate_chromeos.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 "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
 
 #include "ash/common/system/tray/system_tray_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 54 matching lines @@
 }
 
 const std::vector<ash::VPNProvider>& VPNDelegateChromeOS::GetVPNProviders()
     const {
   return vpn_providers_;
 }
 
 void VPNDelegateChromeOS::ShowAddPage(const ash::VPNProvider::Key& key) {
   if (!key.third_party) {
     // Show the "add network" dialog for the built-in OpenVPN/L2TP provider.
-    ash::Shell::GetInstance()->system_tray_delegate()->ShowOtherNetworkDialog(
+    ash::WmShell::Get()->system_tray_delegate()->ShowOtherNetworkDialog(
         shill::kTypeVPN);
     return;
   }
 
   Profile* const profile = GetProfileForPrimaryUser();
   if (!profile)
     return;
 
   // Request that the third-party VPN provider identified by |key.extension_id|
   // show its "add network" dialog.
@@ skipping 66 matching lines @@
 }
 
 void VPNDelegateChromeOS::AttachToPrimaryUserExtensionRegistry() {
   DCHECK(!extension_registry_);
   extension_registry_ =
       extensions::ExtensionRegistry::Get(GetProfileForPrimaryUser());
   extension_registry_->AddObserver(this);
 
   UpdateVPNProviders();
 }