Promotes more accessors from WmShell to Shell

ash/common/system/chromeos/network/tray_vpn.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/common/system/chromeos/network/tray_vpn.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/chromeos/network/network_icon.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
@@ skipping 27 matching lines @@
  public:
   explicit VpnDefaultView(SystemTrayItem* owner) : TrayItemMore(owner) {}
 
   ~VpnDefaultView() override {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
     // Show the VPN entry in the ash tray bubble if at least one third-party VPN
     // provider is installed.
-    if (WmShell::Get()->vpn_list()->HaveThirdPartyVPNProviders())
+    if (Shell::Get()->vpn_list()->HaveThirdPartyVPNProviders())
       return true;
 
     // Also show the VPN entry if at least one VPN network is configured.
     NetworkStateHandler* const handler =
         NetworkHandler::Get()->network_state_handler();
     if (handler->FirstNetworkByType(NetworkTypePattern::VPN()))
       return true;
     return false;
   }
 
@@ skipping 139 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash