Put a hard limit on initial policy fetch wait time.

chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
index d013d5e03b3b670f44a26d5b3151e4535b6d8a9e..bbc06a0a989d07cdde976e35772fef9739877650 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
@@ -8,6 +8,7 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
+#include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -42,6 +43,10 @@ const base::FilePath::CharType kPolicy[] = FILE_PATH_LITERAL("Policy");
 // resources are stored.
 const base::FilePath::CharType kResourceDir[] = FILE_PATH_LITERAL("Resources");
 
+// Timeout in seconds after which to abandon the initial policy fetch and start
+// the session regardless.
+const int kInitialPolicyFetchTimeout = 10;

[Andrew T Wilson (Slow), 2013/09/06 12:33:45]

nit: for time values, I usually like to put the time unit in the constant name
(e.g. kInitialPolicyFetchTimeoutSecs)

[Mattias Nissler (ping if slow), 2013/09/06 13:37:30]

Good point, done.

+
 }  // namespace
 
 // static
@@ -147,9 +152,11 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
     resource_cache.reset(new ResourceCache(resource_cache_dir));
 
   scoped_ptr<UserCloudPolicyManagerChromeOS> manager(
-      new UserCloudPolicyManagerChromeOS(store.PassAs<CloudPolicyStore>(),
-                                         resource_cache.Pass(),
-                                         wait_for_initial_policy));
+      new UserCloudPolicyManagerChromeOS(
+          store.PassAs<CloudPolicyStore>(),
+          resource_cache.Pass(),
+          wait_for_initial_policy,
+          base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeout)));
   manager->Init();
   manager->Connect(g_browser_process->local_state(),
                    device_management_service,