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

ash/common/system/chromeos/network/vpn_delegate.h

 // 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.
 
 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_
 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
     // Whether this key represents a built-in or third-party VPN provider.
     bool third_party;
 
     // ID of the extension that implements this provider. Used for third-party
     // VPN providers only.
     std::string extension_id;
   };
 
   VPNProvider(const Key& key, const std::string& name);
 
+  bool operator==(const VPNProvider& other) const;
+
   // Key that uniquely identifies this VPN provider.
   Key key;
 
   // Human-readable name.

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

// Human-readable name if key.third_party is true, otherwise empty.
Also s/name/third_party_provider_name/ to ensure that we aren't using it
directly without checking key.third_party.

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

Done.

   std::string name;
 };
 
-// This delegate provides UI code in ash, e.g. |VPNList|, with access to the
+// This delegate provides UI code in ash, e.g. |VPNListView|, with access to the
 // list of VPN providers enabled in the primary user's profile. The delegate
 // furthermore allows the UI code to request that a VPN provider show its "add
 // network" dialog.
+// TODO(jamescook): Rename this to VpnList as part of mojo conversion because it
+// won't be a delegate anymore.
 class ASH_EXPORT VPNDelegate {
  public:
   // An observer that is notified whenever the list of VPN providers enabled in
   // the primary user's profile changes.
   class Observer {
    public:
     virtual void OnVPNProvidersChanged() = 0;
 
    protected:
     virtual ~Observer();
 
    private:
     DISALLOW_ASSIGN(Observer);
   };
 
   VPNDelegate();
   virtual ~VPNDelegate();
 
+  const std::vector<VPNProvider>& vpn_providers() { return vpn_providers_; }
+
   // Returns |true| if at least one third-party VPN provider is enabled in the
   // primary user's profile, in addition to the built-in OpenVPN/L2TP provider.
-  virtual bool HaveThirdPartyVPNProviders() const = 0;
-
-  // Returns the list of VPN providers enabled in the primary user's profile.
-  virtual const std::vector<VPNProvider>& GetVPNProviders() const = 0;
+  bool HaveThirdPartyVPNProviders() const;
 
   // Requests that the VPN provider identified by |key| show its "add network"
   // dialog.
   virtual void ShowAddPage(const VPNProvider::Key& key) = 0;

[James Cook, 2016/11/21 19:23:30]

I'm going to move ShowAddPage() to the mojo SystemTrayClient interface in the
next CL. I didn't do it in this CL because I would end up with a
VPNDelegateChromeOS that had no delegate methods.

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

Acknowledged.

 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
- protected:
+  // Sets the list of extension-backed VPN providers. The list may be empty.
+  // Notifies observers. Public for testing.
+  // TODO(jamescook): Convert to mojo interface.
+  void SetThirdPartyVpnProviders(const std::vector<VPNProvider>& providers);
+
+ private:
   // Notify observers that the list of VPN providers enabled in the primary
   // user's profile has changed.
   void NotifyObservers();
 
- private:
+  // Adds the built-in OpenVPN/L2TP provider to |vpn_providers_|.
+  void AddBuiltInProvider();
+
+  // Cache of VPN providers, including the built-in OpenVPN/L2TP provider and
+  // other providers added by extensions in the primary user's profile.
+  std::vector<VPNProvider> vpn_providers_;
+
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(VPNDelegate);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_VPN_DELEGATE_H_