NetworkState cleanup, pass properties to InitialPropertiesReceived

ash/system/chromeos/network/network_icon.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 "ash/system/chromeos/network/network_icon.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 390 matching lines @@
     return StrengthIndex(network->signal_strength(), kNumArcsImages);
   else if (image_type == BARS)
     return StrengthIndex(network->signal_strength(), kNumBarsImages);
   return 0;
 }
 
 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;
   }
   if (id == kUnknownBadgeType)
     return NULL;
   else
     return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
 }
 
@@ skipping 384 matching lines @@
        iter != networks.end(); ++iter) {
     network_paths.insert((*iter)->path());
   }
   PurgeIconMap(ICON_TYPE_TRAY, network_paths);
   PurgeIconMap(ICON_TYPE_DEFAULT_VIEW, network_paths);
   PurgeIconMap(ICON_TYPE_LIST, network_paths);
 }
 
 }  // namespace network_icon
 }  // namespace ash