Reland: chromeos: Convert ash VPNDelegate interface to mojo

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/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.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"
 #include "ash/common/system/chromeos/network/network_state_list_detailed_view.h"
-#include "ash/common/system/chromeos/network/vpn_delegate.h"
+#include "ash/common/system/chromeos/network/vpn_list.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
@@ skipping 14 matching lines @@
                        public network_icon::AnimationObserver {
  public:
   VpnDefaultView(SystemTrayItem* owner, bool show_more)
       : TrayItemMore(owner, show_more) {}
 
   ~VpnDefaultView() override {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   static bool ShouldShow() {
-    VPNDelegate* vpn_delegate =
-        WmShell::Get()->system_tray_delegate()->GetVPNDelegate();
-    // Tests may not have a VPN delegate. They should not show the VPN entry.
-    if (!vpn_delegate)
-      return false;
-
     // Show the VPN entry in the ash tray bubble if at least one third-party VPN
     // provider is installed.
-    if (vpn_delegate->HaveThirdPartyVPNProviders())
+    if (WmShell::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 142 matching lines @@
 void TrayVPN::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {}
 
 void TrayVPN::NetworkStateChanged() {
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash