Make the policy fetch for first time login blocking

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/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 46 matching lines @@
 const base::FilePath::CharType kComponentsDir[] =
     FILE_PATH_LITERAL("Components");
 
 // Directory in which to store external policy data. This is specified relative
 // to kPolicy.
 const base::FilePath::CharType kPolicyExternalDataDir[] =
     FILE_PATH_LITERAL("External Data");
 
 // Timeout in seconds after which to abandon the initial policy fetch and start
 // the session regardless.
-const int kInitialPolicyFetchTimeoutSeconds = 10;
+const int kInitialPolicyFetchTimeoutSeconds = 60;
 
 }  // namespace
 
 // static
 UserCloudPolicyManagerFactoryChromeOS*
     UserCloudPolicyManagerFactoryChromeOS::GetInstance() {
   return Singleton<UserCloudPolicyManagerFactoryChromeOS>::get();
 }
 
 // static
@@ skipping 57 matching lines @@
   // DeviceLocalAccountPolicyService.
   const std::string& username = user->email();
   if (user->GetType() != chromeos::User::USER_TYPE_REGULAR ||
       BrowserPolicyConnector::IsNonEnterpriseUser(username)) {
     return scoped_ptr<UserCloudPolicyManagerChromeOS>();
   }
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   UserAffiliation affiliation = connector->GetUserAffiliation(username);
-  const bool is_managed_user = affiliation == USER_AFFILIATION_MANAGED;
+  const bool is_first_login = user_manager->IsCurrentUserNew();
   const bool is_browser_restart =
       command_line->HasSwitch(chromeos::switches::kLoginUser) &&
       !command_line->HasSwitch(chromeos::switches::kLoginPassword);
-  const bool wait_for_initial_policy = is_managed_user && !is_browser_restart;
+  const bool wait_for_initial_policy = is_first_login && !is_browser_restart;
+  DCHECK(!BrowserPolicyConnector::IsNonEnterpriseUser(username));

[bartfab (slow), 2014/06/16 09:37:27]

Nit: Instead of a DCHECK here, better add a comment in line 135 clarifying that
we bail out there if the user is known to be a consumer. It took me a while to
spot the check there.

[Andrew T Wilson (Slow), 2014/06/16 12:34:58]

+1 to this. I didn't understand this check either.

 
   DeviceManagementService* device_management_service =
       connector->device_management_service();
   if (wait_for_initial_policy)
     device_management_service->ScheduleInitialization(0);
 
   base::FilePath profile_dir = profile->GetPath();
   const base::FilePath legacy_dir = profile_dir.Append(kDeviceManagementDir);
   const base::FilePath policy_cache_file = legacy_dir.Append(kPolicy);
   const base::FilePath token_cache_file = legacy_dir.Append(kToken);
@@ skipping 77 matching lines @@
   BrowserContextKeyedBaseFactory::BrowserContextDestroyed(context);
 }
 
 void UserCloudPolicyManagerFactoryChromeOS::SetEmptyTestingFactory(
     content::BrowserContext* context) {}
 
 void UserCloudPolicyManagerFactoryChromeOS::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy