Chromad: Trigger user/device policy fetch on login/reboot

chrome/browser/chromeos/policy/user_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_policy_manager_factory_chromeos.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 186 matching lines @@
   const bool is_browser_restart =
       command_line->HasSwitch(chromeos::switches::kLoginUser);
   const user_manager::UserManager* const user_manager =
       user_manager::UserManager::Get();
 
   // We want to block for policy in a few situations: if the user is new, or if
   // we are forcing an online signin. An online signin will be forced if there
   // has been a credential error, or if the initial session creation was not
   // completed (the oauth_token_status is not set to valid by OAuth2LoginManager
   // until profile creation/session restore is complete).
-  // TODO(tnagel): Don't limit blocking to cloud managed users.
   const bool block_forever_for_policy =
-      !is_active_directory && !user_manager->IsLoggedInAsStub() &&
+      !user_manager->IsLoggedInAsStub() &&
       (user_manager->IsCurrentUserNew() ||
        user_manager->GetActiveUser()->force_online_signin() ||
        user_manager->GetActiveUser()->oauth_token_status() !=
            user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
   const bool wait_for_policy_fetch =
       block_forever_for_policy || !is_browser_restart;
 
   base::TimeDelta initial_policy_fetch_timeout;
   if (block_forever_for_policy) {
@@ skipping 106 matching lines @@
 
 bool UserPolicyManagerFactoryChromeOS::HasTestingFactory(
     content::BrowserContext* context) {
   return false;
 }
 
 void UserPolicyManagerFactoryChromeOS::CreateServiceNow(
     content::BrowserContext* context) {}
 
 }  // namespace policy