chromeos: Move ownership of ash VPN provider list from chrome into ash

ash/common/system/chromeos/network/vpn_list_view.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 "ash/common/system/chromeos/network/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 432 matching lines @@
     const std::string& name,
     const chromeos::NetworkStateHandler::NetworkStateList& networks) {
   // Add a visual separator, unless this is the topmost entry in the list.
   if (!list_empty_) {
     views::Separator* const separator =
         new views::Separator(views::Separator::HORIZONTAL);
     separator->SetColor(kBorderLightColor);
     container()->AddChildView(separator);
   } else {
     list_empty_ = false;
   }

[stevenjb, 2016/11/21 20:23:18]

std::string vpn_name = key.third_party ? name :
l10n_util::GetStringUTF8(IDS_ASH_STATUS_TRAY_VPN_BUILT_IN_PROVIDER)

[James Cook, 2016/11/21 23:58:38]

Done. (I just passed in the whole provider.)

   // Add a list entry for the VPN provider.
   views::View* provider = nullptr;
   if (UseMd()) {
     provider = new VPNListProviderEntryMd(this, name,
                                           IDS_ASH_STATUS_TRAY_ADD_CONNECTION);
   } else {
     provider = new VPNListProviderEntry(this, name);
   }
   container()->AddChildView(provider);
   provider_view_key_map_[provider] = key;
   // Add the networks belonging to this provider, in the priority order returned
   // by shill.
   for (const chromeos::NetworkState* const& network : networks) {
     if (key.MatchesNetwork(*network))
       AddNetwork(network);
   }
 }
 
 void VPNListView::AddProvidersAndNetworks(
     const chromeos::NetworkStateHandler::NetworkStateList& networks) {
   // Get the list of VPN providers enabled in the primary user's profile.
-  std::vector<VPNProvider> providers = WmShell::Get()
-                                           ->system_tray_delegate()
-                                           ->GetVPNDelegate()
-                                           ->GetVPNProviders();
+  std::vector<VPNProvider> providers =
+      WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->vpn_providers();
 
   // Add providers with at least one configured network along with their
   // networks. Providers are added in the order of their highest priority
   // network.
   for (const chromeos::NetworkState* const& network : networks) {
     for (auto provider = providers.begin(); provider != providers.end();
          ++provider) {
       if (!provider->key.MatchesNetwork(*network))
         continue;
       AddProviderAndNetworks(provider->key, provider->name, networks);
       providers.erase(provider);
       break;
     }
   }
 
   // Add providers without any configured networks, in the order that the
   // providers were returned by the extensions system.
   for (const VPNProvider& provider : providers)
     AddProviderAndNetworks(provider.key, provider.name, networks);
 }
 
 }  // namespace ash