Improved activation logic to cover few more edge cases. Removed button that w...

chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc

Index: chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc
===================================================================
--- chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc	(revision 66030)
+++ chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc	(working copy)
@@ -563,10 +563,12 @@
           }
           break;
         case chromeos::ACTIVATION_STATE_PARTIALLY_ACTIVATED:
-          if (network->connected())
-            new_state = PLAN_ACTIVATION_SHOWING_PAYMENT;
-          else
+          if (network->connected()) {
+            if (network->restricted_pool())
+              new_state = PLAN_ACTIVATION_SHOWING_PAYMENT;
+          } else {
             new_state = PLAN_ACTIVATION_RECONNECTING;
+          }
           break;
         case chromeos::ACTIVATION_STATE_NOT_ACTIVATED:
           // Wait in this state until activation state changes.
@@ -588,6 +590,10 @@
             } else {
               new_state = PLAN_ACTIVATION_DONE;
             }
+          } else if (network->failed()) {
+            chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
+                ConnectToCellularNetwork(network);
+            return;
           }
           break;
         case chromeos::ACTIVATION_STATE_PARTIALLY_ACTIVATED:
@@ -619,7 +625,8 @@
     if ((network->activation_state() ==
             chromeos::ACTIVATION_STATE_PARTIALLY_ACTIVATED ||
         network->activation_state() == chromeos::ACTIVATION_STATE_ACTIVATING) &&
-        network->error() == chromeos::ERROR_UNKNOWN &&
+        (network->error() == chromeos::ERROR_UNKNOWN ||
+            network->error() == chromeos::ERROR_OTASP_FAILED)&&
         (state_ == PLAN_ACTIVATION_INITIATING_ACTIVATION ||
             state_ == PLAN_ACTIVATION_RECONNECTING) &&
         activation_status_test_ &&