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->connection_state() == flimflam::kStatePortal) {

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

Previous implementation was:
 173 bool ConnectivityStateHelperImpl::DefaultNetworkOnline() {	
 174   const NetworkState* network = network_state_handler_->DefaultNetwork();	
 175   if (!network)	
 176     return false;	
 177   if (!network->IsConnectedState())	
 178     return false;	
 179   if (network->connection_state() == flimflam::kStatePortal)	
 180     return false;	
 181   return true;	
 182 }

Are you missing 

(!network->IsConnectedState())	check here?

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

The check was redundant. A non-NULL DefaultNetwork() is always in connected
state.

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

This block should be executed in 3 cases:
1. Network is disconnected (default_network == NULL)
2. Network is in connecting state (how is this covered?)
3. Captive portal (connection_state() == flimflam::kStatePortal)

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

DefaultNetwork() already does the IsConnected() check, so Case 2 is covered.

https://code.google.com/p/chromium/codesearch#chromium/src/chromeos/network/n...

[stevenjb, 2013/08/08 18:10:23]

default_network is still NULL.

With the new NetworkStateHandlers, we switched to using Shill's idea of "Default
Network" - it is the network that is handling traffic (and thus must be
connected), and there is only one. This eliminates a lot of redundant
"IsConnected" checks in the calling code.

This is different from the NetworkLibrary concept of "Active Network" which
might be connecting. For that we now use "FirstNetworkByType" (with convenience
methods of "ConnectedNetworkByType" and "ConnectingNetworkByType" which just
check the state of the first network of that type). "First" is shorthand for
"Highest Priority" - Shill orders networks by priority. "Type" can be
kMatchTypeDefault which indicates the highest priority network of any type.
DefaultNetwork() is shorthand for ConnectedNetworkByType(kMatchTypeDefault).

[Nikita (slow), 2013/08/09 09:44:00]

Thanks for explanation.

     // 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