Increase retry timeout to 1 minute.

Also, reduce the retry timeout in unit tests -- this speeds them up by
~80 seconds. Some cleanup of the libcurl perform timeout.

BUG=5576
TEST=unit tests, gmerged on device, ran update, looked at logs

Change-Id: Ifd554913cf437c43c481950897e7a5067fadee01

Review URL: http://codereview.chromium.org/3187005
diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index 2b2e2cb..17e359e 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -122,7 +122,9 @@
  public:
   HttpFetcher* NewLargeFetcher() {
     LibcurlHttpFetcher *ret = new LibcurlHttpFetcher;
-    ret->set_idle_ms(1000);  // speeds up test execution
+    // Speed up test execution.
+    ret->set_idle_seconds(1);
+    ret->set_retry_seconds(1);
     return ret;
   }
   HttpFetcher* NewSmallFetcher() {