Revert 201968 "Revert 201837 "OOP import on Windows.""

trunk/src/chrome/browser/sync/profile_sync_service_factory.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/sync/profile_sync_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
@@ skipping 21 matching lines @@
 ProfileSyncServiceFactory* ProfileSyncServiceFactory::GetInstance() {
   return Singleton<ProfileSyncServiceFactory>::get();
 }
 
 // static
 ProfileSyncService* ProfileSyncServiceFactory::GetForProfile(
     Profile* profile) {
   if (!ProfileSyncService::IsSyncEnabled())
     return NULL;
 
-  // Do not start sync on the import process.
-  if (ProfileManager::IsImportProcess(*CommandLine::ForCurrentProcess()))
-    return NULL;
-
   return static_cast<ProfileSyncService*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 ProfileSyncServiceFactory::ProfileSyncServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "ProfileSyncService",
         BrowserContextDependencyManager::GetInstance()) {
 
   // The ProfileSyncService depends on various SyncableServices being around
@@ skipping 53 matching lines @@
 
   pss->factory()->RegisterDataTypes(pss);
   pss->Initialize();
   return pss;
 }
 
 // static
 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
   return GetInstance()->GetServiceForBrowserContext(profile, false) != NULL;
 }