Remove ConnectivityStateHelper

chrome/browser/chromeos/login/captive_portal_view.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 "chrome/browser/chromeos/login/captive_portal_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/captive_portal/captive_portal_detector.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
-#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
+#include "chromeos/network/network_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 const char* CaptivePortalStartURL() {
   return captive_portal::CaptivePortalDetector::kDefaultURL;
 }
@@ skipping 19 matching lines @@
 bool CaptivePortalView::CanResize() const {
   return false;
 }
 
 ui::ModalType CaptivePortalView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 string16 CaptivePortalView::GetWindowTitle() const {
   string16 network_name;
-  ConnectivityStateHelper* csh = ConnectivityStateHelper::Get();
-  std::string default_network_name = csh->DefaultNetworkName();
+  const NetworkState* default_network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+  std::string default_network_name =
+      default_network ? default_network->name() : std::string();
   if (!default_network_name.empty()) {
     network_name = ASCIIToUTF16(default_network_name);
   } else {
     DLOG(ERROR)
         << "No active/default network, but captive portal window is shown.";
   }
 
   return l10n_util::GetStringFUTF16(IDS_LOGIN_CAPTIVE_PORTAL_WINDOW_TITLE,
                                     network_name);
 }
@@ skipping 21 matching lines @@
 void CaptivePortalView::LoadingStateChanged(content::WebContents* source) {
   SimpleWebViewDialog::LoadingStateChanged(source);
   // TODO(nkostylev): Fix case of no connectivity, check HTTP code returned.
   // Disable this heuristic as it has false positives.
   // Relying on just shill portal check to close dialog is fine.
   // if (!is_loading && !redirected_)
   //   proxy_->OnOriginalURLLoaded();
 }
 
 }  // namespace chromeos