chromeos: Fix eternal cellular activation spinner

chrome/browser/chromeos/mobile/mobile_activator.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/mobile/mobile_activator.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 442 matching lines @@
 }
 
 bool MobileActivator::ConnectToNetwork(CellularNetwork* network, int delay) {
   if (network && network->connecting_or_connected())
     return true;
   // Permit network connection changes only in reconnecting states.
   if (state_ != PLAN_ACTIVATION_RECONNECTING_OTASP_TRY &&
       state_ != PLAN_ACTIVATION_RECONNECTING &&
       state_ != PLAN_ACTIVATION_RECONNECTING_PAYMENT &&
       state_ != PLAN_ACTIVATION_RECONNECTING_OTASP) return false;
-  if (network)
-    LOG(INFO) << "Connecting to: " << network->service_path();
   connection_retry_count_++;
   connection_start_time_ = base::Time::Now();
-  if (!network || state_ == PLAN_ACTIVATION_RECONNECTING_OTASP) {
-    LOG(WARNING) << "Delaying reconnect to "
-                 << (network ? network->service_path().c_str() : "no service");
+  if (!network) {
+    LOG(WARNING) << "Connect failed, will try again in a little bit.";
     // If we coudn't connect during reconnection phase, try to reconnect
     // with a delay (and try to reconnect if needed).
     BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&MobileActivator::ContinueConnecting, AsWeakPtr(), delay),
         base::TimeDelta::FromMilliseconds(delay));
     return false;
   }
+  LOG(INFO) << "Connecting to: " << network->service_path();
   CrosLibrary::Get()->GetNetworkLibrary()->
       ConnectToCellularNetwork(network);
   return true;
 }
 
 void MobileActivator::ForceReconnect(CellularNetwork* network, int delay) {
   DCHECK(network);
   UMA_HISTOGRAM_COUNTS("Cellular.ActivationRetry", 1);
   // Reset reconnect metrics.
   connection_retry_count_ = 0;
@@ skipping 565 matching lines @@
     value->SetString("IMEI", device->imei());
     value->SetString("MDN", device->mdn());
   }
 }
 
 std::string MobileActivator::GetErrorMessage(const std::string& code) {
   return cellular_config_->GetErrorMessage(code);
 }
 
 }  // namespace chromeos