Avoid dereferencing a NULL DeviceState in NetworkIconImpl::GetBadges().

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 602 matching lines @@
   } else if (type == flimflam::kTypeWimax) {
     technology_badge_ = rb.GetImageSkiaNamed(
         IconTypeIsDark(icon_type_) ?
         IDR_AURA_UBER_TRAY_NETWORK_4G_DARK :
         IDR_AURA_UBER_TRAY_NETWORK_4G_LIGHT);
   } else if (type == flimflam::kTypeCellular) {
     if (network->roaming() == flimflam::kRoamingStateRoaming) {
       // For networks that are always in roaming don't show roaming badge.
       const DeviceState* device =
           handler->GetDeviceState(network->device_path());
-      DCHECK(device);
-      if (!device->provider_requires_roaming()) {
+      LOG_IF(WARNING, !device) << "Could not find device state for "
+                               << network->device_path();
+      if (!device || !device->provider_requires_roaming()) {

[stevenjb, 2013/09/09 17:21:24]

Should't this be (device && !device->provider_requires_roaming())? i.e. if
there's no device, err on the side of not showing the badge.

         badges->bottom_right = rb.GetImageSkiaNamed(
             IconTypeIsDark(icon_type_) ?
             IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK :
             IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT);
       }
     }
   }
   if (!network->IsConnectingState()) {
     badges->top_left = technology_badge_;
     badges->bottom_left = vpn_badge_;
@@ skipping 205 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