Put a hard limit on initial policy fetch wait time.

chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
 
 #include "base/command_line.h"
 #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"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud/device_management_service.h"
 #include "chrome/browser/policy/cloud/resource_cache.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 14 matching lines @@
 // File in the above directory for storing legacy user policy dmtokens.
 const base::FilePath::CharType kToken[] = FILE_PATH_LITERAL("Token");
 // This constant is used to build two different paths. It can be a file inside
 // kDeviceManagementDir where legacy user policy data is stored, and it can be
 // a directory inside the profile directory where other resources are stored.
 const base::FilePath::CharType kPolicy[] = FILE_PATH_LITERAL("Policy");
 // Directory under kPolicy, in the user's profile dir, where external 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
 UserCloudPolicyManagerFactoryChromeOS*
     UserCloudPolicyManagerFactoryChromeOS::GetInstance() {
   return Singleton<UserCloudPolicyManagerFactoryChromeOS>::get();
 }
 
 // static
 UserCloudPolicyManagerChromeOS*
@@ skipping 85 matching lines @@
           chromeos::DBusThreadManager::Get()->GetSessionManagerClient(),
           username, policy_key_dir, token_cache_file, policy_cache_file));
   if (force_immediate_load)
     store->LoadImmediately();
 
   scoped_ptr<ResourceCache> resource_cache;
   if (command_line->HasSwitch(switches::kEnableComponentCloudPolicy))
     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,
                    g_browser_process->system_request_context(),
                    affiliation);
 
   DCHECK(managers_.find(profile) == managers_.end());
   managers_[profile] = manager.get();
   return manager.Pass();
 }
@@ skipping 15 matching lines @@
   BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
 }
 
 void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy