Remove ConnectivityStateHelper

chrome/browser/chromeos/login/oauth2_token_fetcher.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_token_fetcher.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.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/browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.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 11 matching lines @@
 }
 
 OAuth2TokenFetcher::~OAuth2TokenFetcher() {
 }
 
 void OAuth2TokenFetcher::StartExchangeFromCookies() {
   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->connection_state() == flimflam::kStatePortal) {

[Nikita (slow), 2013/08/08 10:47:28]

Same comment about (!network->IsConnectedState()).

See also lines 71..73.

I would prefer to have the same DefaultNetworkOnline() which will cover captive
portal case as well.

[gauravsh, 2013/08/08 16:59:20]

See my previous comment. It was a redundant check since a DefaultNetwork is
always in connected state.

[Nikita (slow), 2013/08/08 17:50:43]

Why check in lines 71..73 is different then?

[gauravsh, 2013/08/08 18:02:41]

Oops, yeah, it should be the same there as well. I will upload a new PS to fix
that.

     // If network is offline, defer the token fetching until online.
     VLOG(1) << "Network is offline.  Deferring OAuth2 token fetch.";
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&OAuth2TokenFetcher::StartExchangeFromCookies,
                    AsWeakPtr()),
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
   auth_fetcher_.StartCookieForOAuthLoginTokenExchange(EmptyString());
 }
 
 void OAuth2TokenFetcher::StartExchangeFromAuthCode(
     const std::string& auth_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   auth_code_ = auth_code;
   // 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() ||
+      default_network->connection_state() == flimflam::kStatePortal) {
     // If network is offline, defer the token fetching until online.
     VLOG(1) << "Network is offline.  Deferring OAuth2 token fetch.";
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&OAuth2TokenFetcher::StartExchangeFromAuthCode,
                    AsWeakPtr(),
                    auth_code),
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
@@ skipping 37 matching lines @@
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
   LOG(ERROR) << "Unrecoverable error or retry count max reached. State: "
              << error.state() << ", network error: " << error.network_error()
              << ", message: " << error.error_message();
   error_handler.Run();
 }
 
 }  // namespace chromeos