Replace misc. network stub flags with more flexible ones

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/logging.h"
@@ skipping 173 matching lines @@
     return NULL;
   return GetNetworkState(default_network_path_);
 }
 
 const FavoriteState* NetworkStateHandler::DefaultFavoriteNetwork() const {
   const NetworkState* default_network = DefaultNetwork();
   if (!default_network)
     return NULL;
   const FavoriteState* default_favorite =
       GetFavoriteState(default_network->path());
-  DCHECK(default_favorite);
-  DCHECK(default_favorite->update_received());
+  DCHECK(default_network->type() != shill::kTypeWifi ||
+         default_favorite) << "No favorite for: " << default_network->path();
+  DCHECK(!default_favorite || default_favorite->update_received())
+      << "No update received for: " << default_network->path();
   return default_favorite;
 }
 
 const NetworkState* NetworkStateHandler::ConnectedNetworkByType(
     const NetworkTypePattern& type) const {
   for (ManagedStateList::const_iterator iter = network_list_.begin();
        iter != network_list_.end(); ++iter) {
     const NetworkState* network = (*iter)->AsNetworkState();
     DCHECK(network);
     if (!network->update_received())
@@ skipping 625 matching lines @@
   }
 
   if (type.MatchesType(shill::kTypeCellular))
     return shill::kTypeCellular;
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace chromeos