Changed wifi arcs to mobile bars for Tether network.

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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 546 matching lines @@
 
   tether_network_state->set_carrier(carrier);
   tether_network_state->set_battery_percentage(battery_percentage);
   tether_network_state->set_signal_strength(signal_strength);
 
   NotifyNetworkListChanged();
   return true;
 }
 
 void NetworkStateHandler::RemoveTetherNetworkState(const std::string& guid) {
-  for (auto iter = tether_network_list_.begin();
-       iter != tether_network_list_.end(); ++iter) {
+  auto iter = DisassociateTetherNetworkStateWithWifiNetwork(guid);
+  if (iter != tether_network_list_.end()) {
+    tether_network_list_.erase(iter);
+    NotifyNetworkListChanged();
+  }
+  return;
+}
+
+NetworkStateHandler::ManagedStateList::iterator
+NetworkStateHandler::DisassociateTetherNetworkStateWithWifiNetwork(
+    const std::string& guid) {
+  ManagedStateList::iterator iter = tether_network_list_.begin();

[Kyle Horimoto, 2017/05/01 17:09:26]

Use this:

for (const auto& tether_network : tether_network_list_)

[lesliewatkins, 2017/05/03 01:23:23]

I just reverted back to the old RemoveTetherNetworkState function and used
GetModifiableNetworkStateFromGuid-- that seemed to be the most sensible way to
deal with this.

+  for (; iter != tether_network_list_.end(); ++iter) {
     if (iter->get()->AsNetworkState()->guid() == guid) {
-      NetworkState* wifi_network = GetModifiableNetworkStateFromGuid(
-          iter->get()->AsNetworkState()->tether_guid());
+      NetworkState* tether_network = iter->get()->AsNetworkState();
+      NetworkState* wifi_network =
+          GetModifiableNetworkStateFromGuid(tether_network->tether_guid());
       if (wifi_network)
         wifi_network->set_tether_guid(std::string());
-
-      tether_network_list_.erase(iter);
-      NotifyNetworkListChanged();
-      return;
+      tether_network->set_tether_guid(std::string());
+      return iter;
     }
   }
+  return iter;
 }
 
 bool NetworkStateHandler::AssociateTetherNetworkStateWithWifiNetwork(
     const std::string& tether_network_guid,
     const std::string& wifi_network_guid) {
   if (tether_technology_state_ != TECHNOLOGY_ENABLED) {
     NET_LOG(ERROR) << "AssociateTetherNetworkStateWithWifiNetwork() called "
                    << "when Tether networks are not enabled. Cannot "
                    << "associate.";
     return false;
@@ skipping 831 matching lines @@
   if (type.MatchesType(shill::kTypeVPN))
     technologies.emplace_back(shill::kTypeVPN);
   if (type.MatchesType(kTypeTether))
     technologies.emplace_back(kTypeTether);
 
   CHECK_GT(technologies.size(), 0ul);
   return technologies;
 }
 
 }  // namespace chromeos