Changed wifi arcs to mobile bars for Tether network.

chromeos/components/tether/wifi_hotspot_connector.cc

 // Copyright 2017 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/components/tether/wifi_hotspot_connector.h"
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "chromeos/network/network_connect.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/proximity_auth/logging/logging.h"
 #include "third_party/cros_system_api/dbus/shill/dbus-constants.h"
 
 namespace chromeos {
 
 namespace tether {
 
 WifiHotspotConnector::WifiHotspotConnector(
     NetworkStateHandler* network_state_handler,
-    NetworkConnect* network_connect)
-    : network_state_handler_(network_state_handler),
+    NetworkConnect* network_connect,
+    ActiveHost* active_host)
+    : active_host_(active_host),
+      network_state_handler_(network_state_handler),
       network_connect_(network_connect),
       timer_(base::MakeUnique<base::OneShotTimer>()),
       weak_ptr_factory_(this) {
   network_state_handler_->AddObserver(this, FROM_HERE);
 }
 
 WifiHotspotConnector::~WifiHotspotConnector() {
   network_state_handler_->RemoveObserver(this, FROM_HERE);
 }
 
 void WifiHotspotConnector::ConnectToWifiHotspot(
     const std::string& ssid,
     const std::string& password,
     const WifiConnectionCallback& callback) {
   DCHECK(!ssid.empty());
   // Note: |password| can be empty in some cases.
 
   if (!callback_.is_null()) {
     DCHECK(timer_->IsRunning());
 
     // If another connection attempt was underway but had not yet completed,
     // call the callback, passing an empty string to signal that the connection
     // did not complete successfully.
     InvokeWifiConnectionCallback(std::string());

[Kyle Horimoto, 2017/04/17 19:50:04]

Now that you make the call to AssociateTetherNetworkStateWithWifiNetwork() in
this class, you need to un-associate the networks when a connection attempt was
underway when another connection attempt begins. You'll need to add a new
function to NetworkStateHandler to do this.

You also need to add a test for this situation.

[lesliewatkins, 2017/04/27 00:33:53]

I think this is done using NetworkStateHandler::RemoveTetherNetworkState

[Kyle Horimoto, 2017/04/27 01:30:07]

Nope - that function removes the network entirely. We don't want to do that; we
just want to disassociate it from a Wi-Fi network. You still need to do that as
part of this CL.

[Kyle Horimoto, 2017/04/28 22:07:28]

This still hasn't been addressed.

[lesliewatkins, 2017/04/29 00:57:53]

Done.

   }
 
   ssid_ = ssid;
   password_ = password;
   wifi_guid_ = base::GenerateGUID();
   callback_ = callback;
   timer_->Start(FROM_HERE,
                 base::TimeDelta::FromSeconds(kConnectionTimeoutSeconds),
                 base::Bind(&WifiHotspotConnector::OnConnectionTimeout,
                            weak_ptr_factory_.GetWeakPtr()));
@@ skipping 12 matching lines @@
   }
 
   if (network->IsConnectedState()) {
     // If a connection occurred, notify observers and exit early.
     InvokeWifiConnectionCallback(wifi_guid_);
     return;
   }
 
   if (network->connectable()) {
     // If the network is now connectable, initiate a connection to it.
+    std::string tether_guid = active_host_->GetTetherNetworkGuid();
+    bool successful_association =
+        network_state_handler_->AssociateTetherNetworkStateWithWifiNetwork(
+            tether_guid, wifi_guid_);
+    if (successful_association) {
+      PA_LOG(INFO) << "Wifi network with ID " << wifi_guid_
+                   << " is connectable. Tether network ID: \"" << tether_guid
+                   << "\", Wi-Fi network ID: \"" << wifi_guid_ << "\"";
+    } else {
+      PA_LOG(INFO) << "Wifi network with ID " << wifi_guid_
+                   << " is connectable, but failed to associate tether network "
+                      "with ID \""
+                   << tether_guid << "\" to Wi-Fi network with ID: \""
+                   << wifi_guid_ << "\"";
+    }
+
     network_connect_->ConnectToNetworkId(wifi_guid_);
   }
 }
 
 void WifiHotspotConnector::InvokeWifiConnectionCallback(
     const std::string& wifi_guid) {
   DCHECK(!callback_.is_null());
 
   // |wifi_guid| may be a reference to |wifi_guid_|, so make a copy of it first
   // before clearing it below.
@@ skipping 44 matching lines @@
   InvokeWifiConnectionCallback(std::string());
 }
 
 void WifiHotspotConnector::SetTimerForTest(std::unique_ptr<base::Timer> timer) {
   timer_ = std::move(timer);
 }
 
 }  // namespace tether
 
 }  // namespace chromeos