commit 049adb5335c6bd6863c70c67ecaca06cccd93027
author Thieu Le <thieule@chromium.org> Mon Nov 12 17:14:51 2012 -0800
committer Gerrit <chrome-bot@google.com> Mon Nov 12 18:36:44 2012 -0800
tree 00988489aaa8cff66a4c286979cf3b23ff09d271
parent 764538d1bcb07883dab5355ff556f6f87b985ba2

shill: cellular: Change cellular disconnect timeout to 45s.

BUG=chromium-os:36292
TEST=Unit tests

Change-Id: I5dfa829d94cda7f9fee3a074bfcfd62ffdfe5864
Reviewed-on: https://gerrit.chromium.org/gerrit/37867
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Thieu Le <thieule@chromium.org>
Tested-by: Thieu Le <thieule@chromium.org>

cellular_capability_universal_unittest.cc

diff --git a/cellular_capability_universal_unittest.cc b/cellular_capability_universal_unittest.cc
index d1a7425..69be576 100644
--- a/cellular_capability_universal_unittest.cc
+++ b/cellular_capability_universal_unittest.cc
@@ -390,7 +390,7 @@
       Bind(&CellularCapabilityUniversalTest::TestCallback, Unretained(this));
   EXPECT_CALL(*modem_simple_proxy,
               Disconnect(::DBus::Path("/"), _, _,
-                         CellularCapability::kTimeoutDefault))
+                         CellularCapability::kTimeoutDisconnect))
       .WillOnce(SaveArg<2>(&disconnect_callback));
   capability_->cellular()->modem_state_ = Cellular::kModemStateConnected;
   capability_->StopModem(&error, callback);
@@ -410,7 +410,7 @@
   Error error;
   ResultCallback disconnect_callback;
   EXPECT_CALL(*modem_simple_proxy_,
-              Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
+              Disconnect(_, _, _, CellularCapability::kTimeoutDisconnect))
       .Times(0);
   capability_->Disconnect(&error, disconnect_callback);
 }
@@ -420,7 +420,7 @@
   ResultCallback disconnect_callback;
   capability_->bearer_path_ = "/foo";
   EXPECT_CALL(*modem_simple_proxy_,
-              Disconnect(_, _, _, CellularCapability::kTimeoutDefault))
+              Disconnect(_, _, _, CellularCapability::kTimeoutDisconnect))
       .Times(0);
   ReleaseCapabilityProxies();
   capability_->Disconnect(&error, disconnect_callback);