Put a hard limit on initial policy fetch wait time.

chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_CHROMEOS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "base/timer/timer.h"
 #include "chrome/browser/policy/cloud/cloud_policy_client.h"
 #include "chrome/browser/policy/cloud/cloud_policy_constants.h"
 #include "chrome/browser/policy/cloud/cloud_policy_manager.h"
 #include "chrome/browser/policy/cloud/cloud_policy_service.h"
 #include "chrome/browser/policy/cloud/component_cloud_policy_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
 class GoogleServiceAuthError;
 class PrefService;
 
@@ skipping 14 matching lines @@
       public CloudPolicyClient::Observer,
       public CloudPolicyService::Observer,
       public ComponentCloudPolicyService::Delegate,
       public BrowserContextKeyedService {
  public:
   // If |wait_for_policy_fetch| is true, IsInitializationComplete() will return
   // false as long as there hasn't been a successful policy fetch.
   UserCloudPolicyManagerChromeOS(
       scoped_ptr<CloudPolicyStore> store,
       scoped_ptr<ResourceCache> resource_cache,
-      bool wait_for_policy_fetch);
+      bool wait_for_policy_fetch,
+      base::TimeDelta initial_policy_fetch_timeout);
   virtual ~UserCloudPolicyManagerChromeOS();
 
   // Initializes the cloud connection. |local_state| and
   // |device_management_service| must stay valid until this object is deleted.
   void Connect(PrefService* local_state,
                DeviceManagementService* device_management_service,
                scoped_refptr<net::URLRequestContextGetter> request_context,
                UserAffiliation user_affiliation);
 
   // This class is one of the policy providers, and must be ready for the
@@ skipping 57 matching lines @@
   scoped_ptr<CloudPolicyStore> store_;
 
   // Handles fetching and storing cloud policy for components. It uses the
   // |store_|, so destroy it first.
   scoped_ptr<ComponentCloudPolicyService> component_policy_service_;
 
   // Whether to wait for a policy fetch to complete before reporting
   // IsInitializationComplete().
   bool wait_for_policy_fetch_;
 
+  // A timer that puts a hard limit on the maximum time to wait for the intial
+  // policy fetch.
+  base::Timer policy_fetch_timeout_;
+
   // The pref service to pass to the refresh scheduler on initialization.
   PrefService* local_state_;
 
   // Used to fetch the policy OAuth token, when necessary. This object holds
   // a callback with an unretained reference to the manager, when it exists.
   scoped_ptr<PolicyOAuth2TokenFetcher> token_fetcher_;
 
   // The access token passed to OnAccessTokenAvailable. It is stored here so
   // that it can be used if OnInitializationCompleted is called later.
   std::string access_token_;
 
   // Timestamps for collecting timing UMA stats.
   base::Time time_init_started_;
   base::Time time_init_completed_;
   base::Time time_token_available_;
   base::Time time_client_registered_;
 
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerChromeOS);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_USER_CLOUD_POLICY_MANAGER_CHROMEOS_H_