Fix VPN icon issues

chrome/browser/chromeos/cros/network_library.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/cros/network_library.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
@@ skipping 1807 matching lines @@
 }
 
 void NetworkLibraryImplBase::RemoveUserActionObserver(
     UserActionObserver* observer) {
   user_action_observers_.RemoveObserver(observer);
 }
 
 // Use flimflam's ordering of the services to determine which type of
 // network to return (i.e. don't assume priority of network types).
 // Note: This does not include any virtual networks.
+namespace {
+Network* highest_priority(Network* a, Network*b) {
+  if (!a)
+    return b;
+  if (!b)
+    return a;
+  if (b->priority_order() < a->priority_order())
+    return b;
+  return a;
+}
+}
+
 const Network* NetworkLibraryImplBase::active_network() const {
   Network* result = NULL;
   if (ethernet_ && ethernet_->is_active())
     result = ethernet_;
-  if ((active_wifi_ && active_wifi_->is_active()) &&
-      (!result ||
-       active_wifi_->priority_order_ < result->priority_order_))
-    result = active_wifi_;
-  if ((active_cellular_ && active_cellular_->is_active()) &&
-      (!result ||
-       active_cellular_->priority_order_ < result->priority_order_))
-    result = active_cellular_;
+  if (active_wifi_ && active_wifi_->is_active())
+    result = highest_priority(result, active_wifi_);
+  if (active_cellular_ && active_cellular_->is_active())
+    result = highest_priority(result, active_cellular_);
+  if (active_virtual_ && active_virtual_->is_active())
+    result = highest_priority(result, active_virtual_);
   return result;
 }
 
 const Network* NetworkLibraryImplBase::connected_network() const {
   Network* result = NULL;
   if (ethernet_ && ethernet_->connected())
     result = ethernet_;
-  if ((active_wifi_ && active_wifi_->connected()) &&
-      (!result ||
-       active_wifi_->priority_order_ < result->priority_order_))
-    result = active_wifi_;
-  if ((active_cellular_ && active_cellular_->connected()) &&
-      (!result ||
-       active_cellular_->priority_order_ < result->priority_order_))
-    result = active_cellular_;
+  if (active_wifi_ && active_wifi_->connected())
+    result = highest_priority(result, active_wifi_);
+  if (active_cellular_ && active_cellular_->connected())
+    result = highest_priority(result, active_cellular_);
   return result;
 }
 
 // Connecting order in logical prefernce.
 const Network* NetworkLibraryImplBase::connecting_network() const {
   if (ethernet_connecting())
     return ethernet_network();
   else if (wifi_connecting())
     return wifi_network();
   else if (cellular_connecting())
@@ skipping 2729 matching lines @@
   return network_library;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::NetworkLibraryImplBase);