Remove ConnectivityStateHelper

chrome/browser/chromeos/login/oauth2_login_verifier.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 "chrome/browser/chromeos/login/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chromeos/network/network_handler.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
+#include "third_party/cros_system_api/dbus/service_constants.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // OAuth token request max retry count.
 const int kMaxRequestAttemptCount = 5;
 // OAuth token request retry delay in milliseconds.
 const int kRequestRestartDelay = 3000;
 
@@ skipping 13 matching lines @@
 }
 
 OAuth2LoginVerifier::~OAuth2LoginVerifier() {
 }
 
 void OAuth2LoginVerifier::VerifyProfileTokens(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Delay the verification if the network is not connected or on a captive
   // portal.
-  ConnectivityStateHelper* csh = ConnectivityStateHelper::Get();
-  if (!csh->DefaultNetworkOnline()) {
+  const NetworkState* default_network =
+      NetworkHandler::Get()->network_state_handler()->DefaultNetwork();
+  if (!default_network ||
+      !default_network->IsConnectedState() ||

[stevenjb, 2013/08/07 01:43:27]

The Default network is always connected.

[gauravsh, 2013/08/07 17:28:19]

Done.

+      default_network->connection_state() == flimflam::kStatePortal) {
     // If network is offline, defer the token fetching until online.
     VLOG(1) << "Network is offline.  Deferring OAuth2 access token fetch.";
     BrowserThread::PostDelayedTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(
             &OAuth2LoginVerifier::VerifyProfileTokens, AsWeakPtr(), profile),
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
@@ skipping 153 matching lines @@
   LOG(ERROR) << "Unrecoverable error or retry count max reached for "
              << operation_id;
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", operation_id),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
   error_handler.Run();
 }
 
 }  // namespace chromeos