NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chromeos/network/network_state.cc

 // 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.
 
 #include "chromeos/network/network_state.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 87 matching lines @@
   } else if (key == flimflam::kPriorityProperty) {
     return GetIntegerValue(key, value, &priority_);
   } else if (key == flimflam::kNetworkTechnologyProperty) {
     return GetStringValue(key, value, &technology_);
   } else if (key == flimflam::kDeviceProperty) {
     return GetStringValue(key, value, &device_path_);
   } else if (key == flimflam::kGuidProperty) {
     return GetStringValue(key, value, &guid_);
   } else if (key == flimflam::kProfileProperty) {
     return GetStringValue(key, value, &profile_path_);
+  } else if (key == flimflam::kProxyConfigProperty) {
+    return GetStringValue(key, value, &proxy_config_);
   } else if (key == shill::kActivateOverNonCellularNetworkProperty) {
     return GetBooleanValue(key, value, &activate_over_non_cellular_networks_);
   } else if (key == shill::kOutOfCreditsProperty) {
     return GetBooleanValue(key, value, &cellular_out_of_credits_);
   } else if (key == flimflam::kWifiHexSsid) {
     return GetStringValue(key, value, &hex_ssid_);
   } else if (key == flimflam::kCountryProperty) {
     // TODO(stevenjb): This is currently experimental. If we find a case where
     // base::DetectEncoding() fails in UpdateName(), where country_code_ is
     // set, figure out whether we can use country_code_ with ConvertToUtf8().
@@ skipping 40 matching lines @@
   dictionary->SetIntegerWithoutPathExpansion(flimflam::kPriorityProperty,
                                              priority());
   dictionary->SetStringWithoutPathExpansion(
       flimflam::kNetworkTechnologyProperty,
       technology());
   dictionary->SetStringWithoutPathExpansion(flimflam::kDeviceProperty,
                                             device_path());
   dictionary->SetStringWithoutPathExpansion(flimflam::kGuidProperty, guid());
   dictionary->SetStringWithoutPathExpansion(flimflam::kProfileProperty,
                                             profile_path());
+  dictionary->SetStringWithoutPathExpansion(flimflam::kProxyConfigProperty,
+                                            proxy_config());
   dictionary->SetBooleanWithoutPathExpansion(
       shill::kActivateOverNonCellularNetworkProperty,
       activate_over_non_cellular_networks());
   dictionary->SetBooleanWithoutPathExpansion(shill::kOutOfCreditsProperty,
                                              cellular_out_of_credits());
 }
 
 bool NetworkState::IsConnectedState() const {
   return StateIsConnected(connection_state_);
 }
@@ skipping 78 matching lines @@
           connection_state == flimflam::kStateConfiguration ||
           connection_state == flimflam::kStateCarrier);
 }
 
 // static
 std::string NetworkState::IPConfigProperty(const char* key) {
   return base::StringPrintf("%s.%s", shill::kIPConfigProperty, key);
 }
 
 }  // namespace chromeos