Reland: chromeos: Convert ash VPNDelegate interface to mojo

ash/common/system/chromeos/network/vpn_list_unittest.cc

Index: ash/common/system/chromeos/network/vpn_list_unittest.cc
diff --git a/ash/common/system/chromeos/network/vpn_delegate_unittest.cc b/ash/common/system/chromeos/network/vpn_list_unittest.cc
similarity index 33%
rename from ash/common/system/chromeos/network/vpn_delegate_unittest.cc
rename to ash/common/system/chromeos/network/vpn_list_unittest.cc
index 160b51f48417d348fad7e367ffd6c112a8904ccd..f5685a297dd67619e47a58d123e0219a64ad14d2 100644
--- a/ash/common/system/chromeos/network/vpn_delegate_unittest.cc
+++ b/ash/common/system/chromeos/network/vpn_list_unittest.cc
@@ -2,63 +2,100 @@
 // 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_delegate.h"
+#include "ash/common/system/chromeos/network/vpn_list.h"
 
 #include <algorithm>
 #include <vector>
 
+#include "ash/public/interfaces/vpn_list.mojom.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ash::mojom::ThirdPartyVpnProvider;
+using ash::mojom::ThirdPartyVpnProviderPtr;
+
 namespace ash {
 
 namespace {
 
-class TestVpnDelegate : public VPNDelegate {
+class TestVpnListObserver : public VpnList::Observer {
  public:
-  TestVpnDelegate() {}
-  ~TestVpnDelegate() override {}
+  TestVpnListObserver() {}
+  ~TestVpnListObserver() override {}
 
-  // VPNDelegate:
-  void ShowAddPage(const VPNProvider::Key& key) override {}
+  // VpnList::Observer:
+  void OnVPNProvidersChanged() override { change_count_++; }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestVpnDelegate);
+  int change_count_ = 0;
 };
 
 }  // namespace
 
-using VpnDelegateTest = testing::Test;
+using VpnListTest = testing::Test;
 
-TEST_F(VpnDelegateTest, BuiltInProvider) {
-  TestVpnDelegate delegate;
+TEST_F(VpnListTest, BuiltInProvider) {
+  VpnList vpn_list;
 
   // The VPN list should only contain the built-in provider.
-  ASSERT_EQ(1u, delegate.vpn_providers().size());
-  VPNProvider provider = delegate.vpn_providers()[0];
+  ASSERT_EQ(1u, vpn_list.vpn_providers().size());
+  VPNProvider provider = vpn_list.vpn_providers()[0];
   EXPECT_FALSE(provider.key.third_party);
   EXPECT_TRUE(provider.key.extension_id.empty());
 }
 
-TEST_F(VpnDelegateTest, ThirdPartyProviders) {
-  TestVpnDelegate delegate;
+TEST_F(VpnListTest, ThirdPartyProviders) {
+  VpnList vpn_list;
 
   // The VPN list should only contain the built-in provider.
-  EXPECT_EQ(1u, delegate.vpn_providers().size());
+  EXPECT_EQ(1u, vpn_list.vpn_providers().size());
 
   // Add some third party (extension-backed) providers.
+  std::vector<ThirdPartyVpnProviderPtr> third_party_providers;
+  ThirdPartyVpnProviderPtr third_party1 = ThirdPartyVpnProvider::New();
+  third_party1->name = "name1";
+  third_party1->extension_id = "extension_id1";
+  third_party_providers.push_back(std::move(third_party1));
+
+  ThirdPartyVpnProviderPtr third_party2 = ThirdPartyVpnProvider::New();
+  third_party2->name = "name2";
+  third_party2->extension_id = "extension_id2";
+  third_party_providers.push_back(std::move(third_party2));
+
+  vpn_list.SetThirdPartyVpnProviders(std::move(third_party_providers));
+
+  // Mojo types will be converted to internal ash types.
   VPNProvider::Key key1("extension_id1");
   VPNProvider provider1(key1, "name1");
   VPNProvider::Key key2("extension_id2");
   VPNProvider provider2(key2, "name2");
-  std::vector<VPNProvider> third_party_providers = {provider1, provider2};
-  delegate.SetThirdPartyVpnProviders(third_party_providers);
 
   // List contains the extension-backed providers. Order doesn't matter.
-  std::vector<VPNProvider> providers = delegate.vpn_providers();
+  std::vector<VPNProvider> providers = vpn_list.vpn_providers();
   EXPECT_EQ(3u, providers.size());
   EXPECT_EQ(1u, std::count(providers.begin(), providers.end(), provider1));
   EXPECT_EQ(1u, std::count(providers.begin(), providers.end(), provider2));
 }
 
+TEST_F(VpnListTest, Observers) {
+  VpnList vpn_list;
+
+  // Observers are not notified when they are added.
+  TestVpnListObserver observer;
+  vpn_list.AddObserver(&observer);
+  EXPECT_EQ(0, observer.change_count_);
+
+  // Add a third party (extension-backed) provider.
+  std::vector<ThirdPartyVpnProviderPtr> third_party_providers;
+  ThirdPartyVpnProviderPtr third_party1 = ThirdPartyVpnProvider::New();
+  third_party1->name = "name1";
+  third_party1->extension_id = "extension_id1";
+  third_party_providers.push_back(std::move(third_party1));
+  vpn_list.SetThirdPartyVpnProviders(std::move(third_party_providers));
+
+  // Observer was notified.
+  EXPECT_EQ(1, observer.change_count_);
+
+  vpn_list.RemoveObserver(&observer);
+}
+
 }  // namespace ash