Upstream Android native crash handling changes.

chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

Index: chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 32d9f81796bd6b06c034327915db36d4d7989884..08710f2bfd10fac827b80b7e724ee44d115f4075 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -744,8 +744,7 @@ bool MobileSetupHandler::ConnectToNetwork(
   if (state_ != PLAN_ACTIVATION_RECONNECTING_OTASP_TRY &&
       state_ != PLAN_ACTIVATION_RECONNECTING &&
       state_ != PLAN_ACTIVATION_RECONNECTING_PAYMENT &&
-      state_ != PLAN_ACTIVATION_RECONNECTING_OTASP)
-    return false;
+      state_ != PLAN_ACTIVATION_RECONNECTING_OTASP) return false;

[Mark Mentovai, 2012/04/09 22:55:58]

This too.

   if (network)
     LOG(INFO) << "Connecting to: " << network->service_path();
   connection_retry_count_++;
@@ -757,7 +756,7 @@ bool MobileSetupHandler::ConnectToNetwork(
     // with a delay (and try to reconnect if needed).
     BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&MobileSetupHandler::ContinueConnecting, AsWeakPtr(), delay),
-        delay);
+        base::TimeDelta::FromMilliseconds(delay));
     return false;
   }
   chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
@@ -780,7 +779,7 @@ void MobileSetupHandler::ForceReconnect(
   // Check the network state 3s after we disconnect to make sure.
   BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&MobileSetupHandler::ContinueConnecting, AsWeakPtr(), delay),
-      delay);
+      base::TimeDelta::FromMilliseconds(delay));
 }
 
 bool MobileSetupHandler::ConnectionTimeout() {
@@ -1185,7 +1184,7 @@ void MobileSetupHandler::ChangeState(chromeos::CellularNetwork* network,
       UMA_HISTOGRAM_COUNTS("Cellular.RetryOTASP", 1);
       BrowserThread::PostDelayedTask(BrowserThread::UI, FROM_HERE,
           base::Bind(&MobileSetupHandler::RetryOTASP, AsWeakPtr()),
-          kOTASPRetryDelay);
+          base::TimeDelta::FromMilliseconds(kOTASPRetryDelay));
       break;
     }
     case PLAN_ACTIVATION_INITIATING_ACTIVATION: