Get device by type for Hardware Address

chromeos/network/network_state_handler.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_handler.h"
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/metrics/histogram.h"
@@ skipping 229 matching lines @@
     if (!network->update_received())
       continue;
     if (network->Matches(type))
       return network;
   }
   return NULL;
 }
 
 std::string NetworkStateHandler::HardwareAddressForType(
     const NetworkTypePattern& type) const {
+  const DeviceState* device = NULL;
   const NetworkState* network = ConnectedNetworkByType(type);
-  if (!network)
-    return std::string();
-  const DeviceState* device = GetDeviceState(network->device_path());
+  if (network)
+    device = GetDeviceState(network->device_path());
+  else
+    device = GetDeviceStateByType(type);
   if (!device)
     return std::string();
   std::string result = device->mac_address();
   StringToUpperASCII(&result);
   return result;
 }
 
 std::string NetworkStateHandler::FormattedHardwareAddressForType(
     const NetworkTypePattern& type) const {
   std::string address = HardwareAddressForType(type);
@@ skipping 553 matching lines @@
   }
 
   if (type.MatchesType(shill::kTypeCellular))
     return shill::kTypeCellular;
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace chromeos