Add Tether to Mobile NetworkTypePattern.

chromeos/network/network_connect.cc

 // Copyright (c) 2013 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_connect.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 417 matching lines @@
   if (enabled_state == enabled) {
     NET_LOG_USER("Technology already in target state.", log_string);
     return;
   }
   if (enabled) {
     // User requested to disable the technology.
     handler->SetTechnologyEnabled(technology, false,
                                   network_handler::ErrorCallback());
     return;
   }
-  // If we're dealing with a mobile network, then handle SIM lock here.
-  // SIM locking only applies to cellular, so the code below won't execute
-  // if |technology| has been explicitly set to WiMAX.
-  if (technology.MatchesPattern(NetworkTypePattern::Mobile())) {
+  // If we're dealing with a cellular network, then handle SIM lock here.
+  // SIM locking only applies to cellular.
+  if (technology.MatchesPattern(NetworkTypePattern::Cellular())) {
     const DeviceState* mobile = handler->GetDeviceStateByType(technology);
     if (!mobile) {
       NET_LOG_ERROR("SetTechnologyEnabled with no device", log_string);
       return;
     }
-    // The following only applies to cellular.
-    if (mobile->type() == shill::kTypeCellular) {
-      if (mobile->IsSimAbsent()) {
-        // If this is true, then we have a cellular device with no SIM
-        // inserted. TODO(armansito): Chrome should display a notification here,
-        // prompting the user to insert a SIM card and restart the device to
-        // enable cellular. See crbug.com/125171.
-        NET_LOG_USER("Cannot enable cellular device without SIM.", log_string);
-        return;
-      }
-      if (!mobile->sim_lock_type().empty()) {
-        // A SIM has been inserted, but it is locked. Let the user unlock it
-        // via the dialog.
-        delegate_->ShowMobileSimDialog();
-        return;
-      }
+    if (mobile->IsSimAbsent()) {
+      // If this is true, then we have a cellular device with no SIM
+      // inserted. TODO(armansito): Chrome should display a notification here,
+      // prompting the user to insert a SIM card and restart the device to
+      // enable cellular. See crbug.com/125171.
+      NET_LOG_USER("Cannot enable cellular device without SIM.", log_string);
+      return;
+    }
+    if (!mobile->sim_lock_type().empty()) {
+      // A SIM has been inserted, but it is locked. Let the user unlock it
+      // via the dialog.
+      delegate_->ShowMobileSimDialog();
+      return;
     }
   }
   handler->SetTechnologyEnabled(technology, true,
                                 network_handler::ErrorCallback());
 }
 
 void NetworkConnectImpl::ActivateCellular(const std::string& network_id) {
   NET_LOG_USER("ActivateCellular", network_id);
   const NetworkState* cellular = GetNetworkStateFromId(network_id);
   if (!cellular || cellular->type() != shill::kTypeCellular) {
@@ skipping 108 matching lines @@
 NetworkConnect* NetworkConnect::Get() {
   CHECK(g_network_connect);
   return g_network_connect;
 }
 
 NetworkConnect::NetworkConnect() {}
 
 NetworkConnect::~NetworkConnect() {}
 
 }  // namespace chromeos