diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 32b6530..19b7989 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -916,7 +916,7 @@
     system_state_->p2p_manager()->LookupUrlForFile(
         file_id,
         minimum_size,
-        TimeDelta::FromHours(kMaxP2PNetworkWaitTimeSeconds),
+        TimeDelta::FromSeconds(kMaxP2PNetworkWaitTimeSeconds),
         base::Bind(&OmahaRequestAction::OnLookupPayloadViaP2PCompleted,
                    base::Unretained(this)));
   }
diff --git a/omaha_request_action_unittest.cc b/omaha_request_action_unittest.cc
index 97acded..a1641f1 100644
--- a/omaha_request_action_unittest.cc
+++ b/omaha_request_action_unittest.cc
@@ -1827,7 +1827,8 @@
   MockP2PManager mock_p2p_manager;
   mock_p2p_manager.fake().SetLookupUrlForFileResult(p2p_client_result_url);
 
-  EXPECT_CALL(mock_p2p_manager, LookupUrlForFile(_, _, _, _))
+  TimeDelta timeout = TimeDelta::FromSeconds(kMaxP2PNetworkWaitTimeSeconds);
+  EXPECT_CALL(mock_p2p_manager, LookupUrlForFile(_, _, timeout, _))
       .Times(expect_p2p_client_lookup ? 1 : 0);
 
   ASSERT_TRUE(