Index: chrome/browser/policy/user_policy_signin_service.cc |
diff --git a/chrome/browser/policy/user_policy_signin_service.cc b/chrome/browser/policy/user_policy_signin_service.cc |
index 96c7a2e93de01bf22af13ce0d1611b0f482814bb..37fd193c98588966429af77cff667dfe71c2e453 100644 |
--- a/chrome/browser/policy/user_policy_signin_service.cc |
+++ b/chrome/browser/policy/user_policy_signin_service.cc |
@@ -6,6 +6,7 @@ |
#include <vector> |
+#include "base/command_line.h" |
#include "base/prefs/pref_service.h" |
#include "base/values.h" |
#include "chrome/browser/browser_process.h" |
@@ -16,6 +17,7 @@ |
#include "chrome/browser/policy/user_cloud_policy_manager_factory.h" |
#include "chrome/browser/policy/user_info_fetcher.h" |
#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/signin/signin_manager.h" |
#include "chrome/browser/signin/signin_manager_factory.h" |
#include "chrome/browser/signin/token_service.h" |
@@ -217,8 +219,11 @@ void CloudPolicyClientRegistrationHelper::OnClientError( |
UserPolicySigninService::UserPolicySigninService( |
Profile* profile) |
: profile_(profile) { |
- if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin)) |
+ CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
+ if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin) || |
+ ProfileManager::IsImportProcess(*cmd_line)) { |
return; |
+ } |
// Initialize/shutdown the UserCloudPolicyManager when the user signs out. |
registrar_.Add(this, |