Cleanup network type matching.

ash/system/chromeos/network/network_state_notifier.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 "ash/system/chromeos/network/network_state_notifier.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 11 matching lines @@
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 
 using chromeos::NetworkConnectionHandler;
 using chromeos::NetworkHandler;
 using chromeos::NetworkState;
 using chromeos::NetworkStateHandler;
+using chromeos::NetworkTypePattern;
 
 namespace {
 
 const char kNetworkOutOfCreditsNotificationId[] =
     "chrome://settings/internet/out-of-credits";
 
 const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
 
 // Error messages based on |error_name|, not network_state->error().
 string16 GetConnectErrorString(const std::string& error_name) {
@@ skipping 89 matching lines @@
   // shown a notification (or have since connected to another network type).
   if (!cellular->cellular_out_of_credits() || did_show_out_of_credits_)
     return;
 
   // Only display a notification if not connected, connecting, or waiting to
   // connect to another network.
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   const NetworkState* default_network = handler->DefaultNetwork();
   if (default_network && default_network != cellular)
     return;
-  if (handler->ConnectingNetworkByType(
-          NetworkStateHandler::kMatchTypeNonVirtual) ||
+  if (handler->ConnectingNetworkByType(NetworkTypePattern::NonVirtual()) ||
       NetworkHandler::Get()->network_connection_handler()
           ->HasPendingConnectRequest())
     return;
 
   did_show_out_of_credits_ = true;
   base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
   if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
     out_of_credits_notify_time_ = base::Time::Now();
     string16 error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_OUT_OF_CREDITS_BODY,
@@ skipping 119 matching lines @@
 
   ShowErrorNotification(
       network_connect::kNetworkConnectNotificationId,
       network_type,
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE),
       error_msg,
       base::Bind(&network_connect::ShowNetworkSettings, service_path));
 }
 
 }  // namespace ash