Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
index 36424658555c9a51c7d809b7b624a63e60e51221..f7c8d54b5a492b7835732b5fd83045001f600058 100644 |
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc |
@@ -91,7 +91,7 @@ UserCloudPolicyManagerChromeOS::UserCloudPolicyManagerChromeOS( |
wait_for_policy_fetch_(wait_for_policy_fetch), |
policy_fetch_timeout_(false, false) { |
time_init_started_ = base::Time::Now(); |
- if (wait_for_policy_fetch_) { |
+ if (wait_for_policy_fetch_ && !initial_policy_fetch_timeout.is_max()) { |
policy_fetch_timeout_.Start( |
FROM_HERE, |
initial_policy_fetch_timeout, |