Fix minor bugs found in NetworkConnectionHandler code

* Removed an unused member variable
* Use GetStringWithoutPathExpansion consistently except where expansion is desired
* Use kProviderTypeProperty (with expansion) instead of kTypeProperty

BUG=247104

Review URL: https://chromiumcodereview.appspot.com/17167010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208065 0039d316-1c4b-4281-b951-d872f2087c98

chromeos/network/network_connection_handler.cc

@@ -72,13 +72,15 @@ bool VPNIsConfigured(const std::string& service_path,
   }
   std::string provider_type;
   // Note: we use Value path expansion to extract Provider.Type.
-  if (!properties->GetString(flimflam::kTypeProperty, &provider_type)) {
+  if (!properties->GetStringWithoutPathExpansion(
+          flimflam::kTypeProperty, &provider_type)) {
     NET_LOG_ERROR("VPN Provider Type not present", service_path);
     return false;
   }
   if (provider_type == flimflam::kProviderOpenVpn) {
     std::string hostname;
-    properties->GetString(flimflam::kHostProperty, &hostname);
+    properties->GetStringWithoutPathExpansion(
+        flimflam::kHostProperty, &hostname);
     if (hostname.empty()) {
       NET_LOG_EVENT("OpenVPN: No hostname", service_path);
       return false;
@@ -220,7 +222,7 @@ void NetworkConnectionHandler::OnCertificatesLoaded(
                      true /* ignore_error_state */);
   } else if (initial_load) {
     // Once certificates have loaded, connect to the "best" available network.
-    NetworkHandler::Get()->network_state_handler()->ConnectToBestWifiNetwork();
+    network_state_handler_->ConnectToBestWifiNetwork();
   }
 }
 
@@ -399,7 +401,8 @@ void NetworkConnectionHandler::VerifyConfiguredAndConnect(
 
     if (network->type() == flimflam::kTypeVPN) {
       std::string provider_type;
-      properties.GetString(flimflam::kTypeProperty, &provider_type);
+      // Get 'Type' property from 'Provider' dictionary (use expansion).
+      properties.GetString(flimflam::kProviderTypeProperty, &provider_type);
       if (provider_type == flimflam::kProviderOpenVpn) {
         config_properties.SetStringWithoutPathExpansion(
             flimflam::kOpenVPNClientCertSlotProperty, tpm_slot);

chromeos/network/network_connection_handler.h

@@ -169,7 +169,6 @@ class CHROMEOS_EXPORT NetworkConnectionHandler
   // Local references to the associated handler instances.
   CertLoader* cert_loader_;
   NetworkStateHandler* network_state_handler_;
-  NetworkProfileHandler* network_profile_handler_;
   NetworkConfigurationHandler* network_configuration_handler_;
 
   // Map of pending connect requests, used to prevent repeated attempts while