Cleanup network type matching.

chrome/browser/chromeos/login/auth_prewarmer.cc

 // Copyright 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 "chrome/browser/chromeos/login/auth_prewarmer.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/preconnect.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 "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "url/gurl.h"
 
 namespace chromeos {
 
 AuthPrewarmer::AuthPrewarmer()
     : doing_prewarm_(false) {
 }
 
@@ skipping 81 matching lines @@
   }
   if (!completion_callback_.is_null()) {
     content::BrowserThread::PostTask(content::BrowserThread::UI,
                                      FROM_HERE,
                                      completion_callback_);
   }
 }
 
 bool AuthPrewarmer::IsNetworkConnected() const {
   NetworkStateHandler* nsh = NetworkHandler::Get()->network_state_handler();
-  return (nsh->ConnectedNetworkByType(NetworkStateHandler::kMatchTypeDefault) !=
-          NULL);
+  return (nsh->ConnectedNetworkByType(NetworkTypePattern::Default()) != NULL);
 }
 
 net::URLRequestContextGetter* AuthPrewarmer::GetRequestContext() const {
   return ProfileHelper::GetSigninProfile()->GetRequestContext();
 }
 
 }  // namespace chromeos