cros vpn config: Read UI data from the correct VPN dictionaries.

chrome/browser/chromeos/options/vpn_config_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 92 matching lines @@
   const std::string GetServer() const;
   const std::string GetPSKPassphrase() const;
   const std::string GetUsername() const;
   const std::string GetUserPassphrase() const;
   const std::string GetOTP() const;
   const std::string GetGroupName() const;
   const std::string GetServerCACertNssNickname() const;
   const std::string GetUserCertID() const;
 
   // Parses a VPN UI |property| from the given |network|. |key| is the property
-  // name within the type-specific VPN subdictionary.
+  // name within the type-specific VPN subdictionary named |dict_key|.
   void ParseVPNUIProperty(NetworkPropertyUIData* property_ui_data,
                           Network* network,
+                          const std::string& dict_key,
                           const std::string& key);
 
   CertLibrary* cert_library_;
 
   std::string server_hostname_;
   string16 service_name_from_server_;
   bool service_text_modified_;
 
   // Initialized in Init():
 
@@ skipping 34 matching lines @@
   views::Label* group_name_label_;
   views::Textfield* group_name_textfield_;
   views::Label* error_label_;
 
   DISALLOW_COPY_AND_ASSIGN(VPNConfigView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_