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

chrome/browser/ui/ash/vpn_delegate_chromeos.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 "chrome/browser/ui/ash/vpn_delegate_chromeos.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
-#include "chrome/grit/generated_resources.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/api/vpn_provider/vpn_service.h"
 #include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/permissions/api_permission.h"
@@ skipping 30 matching lines @@
     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CREATED,
                    content::NotificationService::AllSources());
   }
 }
 
 VPNDelegateChromeOS::~VPNDelegateChromeOS() {
   if (extension_registry_)
     extension_registry_->RemoveObserver(this);
 }
 
-bool VPNDelegateChromeOS::HaveThirdPartyVPNProviders() const {
-  for (const ash::VPNProvider& provider : vpn_providers_) {
-    if (provider.key.third_party)
-      return true;
-  }
-  return false;
-}
-
-const std::vector<ash::VPNProvider>& VPNDelegateChromeOS::GetVPNProviders()
-    const {
-  return vpn_providers_;
-}
-
-void VPNDelegateChromeOS::ShowAddPage(const ash::VPNProvider::Key& key) {
-  if (!key.third_party) {
+void VPNDelegateChromeOS::ShowAddPage(const std::string& extension_id) {
+  if (extension_id.empty()) {
     // Show the "add network" dialog for the built-in OpenVPN/L2TP provider.
     SystemTrayClient::Get()->ShowNetworkCreate(shill::kTypeVPN);
     return;
   }
 
   Profile* const profile = GetProfileForPrimaryUser();
   if (!profile)
     return;
 
   // Request that the third-party VPN provider identified by |key.extension_id|
   // show its "add network" dialog.
   chromeos::VpnServiceFactory::GetForBrowserContext(profile)
-      ->SendShowAddDialogToExtension(key.extension_id);
+      ->SendShowAddDialogToExtension(extension_id);
 }
 
 void VPNDelegateChromeOS::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
   if (IsVPNProvider(extension))
     UpdateVPNProviders();
 }
 
 void VPNDelegateChromeOS::OnExtensionUnloaded(
@@ skipping 29 matching lines @@
   registrar_.RemoveAll();
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
       base::Bind(&VPNDelegateChromeOS::AttachToPrimaryUserExtensionRegistry,
                  weak_factory_.GetWeakPtr()));
 }
 
 void VPNDelegateChromeOS::UpdateVPNProviders() {
   DCHECK(extension_registry_);
 
-  vpn_providers_.clear();
+  std::vector<ash::VPNProvider> third_party_providers;
   for (const auto& extension : extension_registry_->enabled_extensions()) {
     if (IsVPNProvider(extension.get())) {
-      vpn_providers_.push_back(ash::VPNProvider(
-          ash::VPNProvider::Key(extension->id()), extension->name()));
+      third_party_providers.push_back(
+          ash::VPNProvider(extension->id(), extension->name()));
     }
   }
-  // Add the built-in OpenVPN/L2TP provider. The ash::VPNProvider::Key()
-  // constructor generates a key that identifies that built-in provider and has
-  // no extension ID.
-  vpn_providers_.push_back(ash::VPNProvider(
-      ash::VPNProvider::Key(),
-      l10n_util::GetStringUTF8(IDS_NETWORK_VPN_BUILT_IN_PROVIDER)));
 
-  NotifyObservers();
+  // Ash adds the built-in OpenVPN/L2TP provider.
+  SetThirdPartyVpnProviders(third_party_providers);
 }
 
 void VPNDelegateChromeOS::AttachToPrimaryUserExtensionRegistry() {
   DCHECK(!extension_registry_);
   extension_registry_ =
       extensions::ExtensionRegistry::Get(GetProfileForPrimaryUser());
   extension_registry_->AddObserver(this);
 
   UpdateVPNProviders();
 }