NetworkState cleanup, pass properties to InitialPropertiesReceived

Some NetworkState cleanup.

This passes the complete dictionary of properties to NetworkState::
InitialPropertesReceived() so that they can be processed without having
to parse and store each individual property.

Also renames technology_ to network_technology_ to match the Shill terminology (and reduce confusion with type_ which is really technology type).

BUG=263978
R=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/21030006

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

2 files changed, 14 insertions, 12 deletions

diff --git a/ash/system/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc
index 141c24b..e931035 100644
--- a/ash/system/chromeos/network/network_icon.cc
+++ b/ash/system/chromeos/network/network_icon.cc
@@ -408,41 +408,42 @@ const gfx::ImageSkia* BadgeForNetworkTechnology(const NetworkState* network,
                                                 IconType icon_type) {
   const int kUnknownBadgeType = -1;
   int id = kUnknownBadgeType;
-  if (network->technology() == flimflam::kNetworkTechnologyEvdo) {
+  const std::string& technology = network->network_technology();
+  if (technology == flimflam::kNetworkTechnologyEvdo) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_3G_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnology1Xrtt) {
+  } else if (technology == flimflam::kNetworkTechnology1Xrtt) {
     id = IDR_AURA_UBER_TRAY_NETWORK_1X;
-  } else if (network->technology() == flimflam::kNetworkTechnologyGprs) {
+  } else if (technology == flimflam::kNetworkTechnologyGprs) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyEdge) {
+  } else if (technology == flimflam::kNetworkTechnologyEdge) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_EDGE_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_EDGE_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyUmts) {
+  } else if (technology == flimflam::kNetworkTechnologyUmts) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_3G_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyHspa) {
+  } else if (technology == flimflam::kNetworkTechnologyHspa) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_HSPA_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_HSPA_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyHspaPlus) {
+  } else if (technology == flimflam::kNetworkTechnologyHspaPlus) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_HSPA_PLUS_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyLte) {
+  } else if (technology == flimflam::kNetworkTechnologyLte) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_LTE_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyLteAdvanced) {
+  } else if (technology == flimflam::kNetworkTechnologyLteAdvanced) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT;
-  } else if (network->technology() == flimflam::kNetworkTechnologyGsm) {
+  } else if (technology == flimflam::kNetworkTechnologyGsm) {
     id = IconTypeIsDark(icon_type) ?
         IDR_AURA_UBER_TRAY_NETWORK_GPRS_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_GPRS_LIGHT;
diff --git a/ash/system/chromeos/network/network_observer.cc b/ash/system/chromeos/network/network_observer.cc
index 592c7ed..09f4f45 100644
--- a/ash/system/chromeos/network/network_observer.cc
+++ b/ash/system/chromeos/network/network_observer.cc
@@ -16,8 +16,9 @@ NetworkObserver::NetworkType NetworkObserver::GetNetworkTypeForNetworkState(
     return NETWORK_UNKNOWN;
   const std::string& type = network->type();
   if (type == flimflam::kTypeCellular) {
-    if (network->technology() == flimflam::kNetworkTechnologyLte ||
-        network->technology() == flimflam::kNetworkTechnologyLteAdvanced)
+    const std::string& technology = network->network_technology();
+    if (technology == flimflam::kNetworkTechnologyLte ||
+        technology == flimflam::kNetworkTechnologyLteAdvanced)
       return NETWORK_CELLULAR_LTE;
     else
       return NETWORK_CELLULAR;