Revert 201837 "OOP import on Windows."

trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc

 // 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.
 
 #include "chrome/browser/policy/cloud/user_policy_signin_service.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 208 matching lines @@
     policy::CloudPolicyClient* client) {
   DVLOG(1) << "Client registration failed";
   DCHECK_EQ(client, client_);
   RequestCompleted();
 }
 
 UserPolicySigninService::UserPolicySigninService(
     Profile* profile)
     : profile_(profile),
       weak_factory_(this) {
-  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,
                  chrome::NOTIFICATION_GOOGLE_SIGNED_OUT,
                  content::Source<Profile>(profile));
 
   // Listen for an OAuth token to become available so we can register a client
   // if for some reason the client is not already registered (for example, if
   // the policy load failed during initial signin).
   registrar_.Add(this,
@@ skipping 341 matching lines @@
   // before UserCloudPolicyManager shuts down the CloudPolicyClient.
   registration_helper_.reset();
   StopObserving();
 }
 
 UserCloudPolicyManager* UserPolicySigninService::GetManager() {
   return UserCloudPolicyManagerFactory::GetForProfile(profile_);
 }
 
 }  // namespace policy