Re-apply http://codereview.chromium.org/1622012

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2006-2008 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.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
@@ skipping 501 matching lines @@
 
   if (data_type_manager_.get()) {
     syncable::ModelTypeSet validated_preferred_types;
     GetPreferredDataTypes(&validated_preferred_types);
     data_type_manager_->Configure(validated_preferred_types);
   }
 }
 
 void ProfileSyncService::GetPreferredDataTypes(
     syncable::ModelTypeSet* preferred_types) const {
- preferred_types->clear();
+  preferred_types->clear();
 
   // Filter out any datatypes which aren't registered, or for which
   // the preference can't be read.
   syncable::ModelTypeSet registered_types;
   GetRegisteredDataTypes(&registered_types);
   for (int i = 0; i < syncable::MODEL_TYPE_COUNT; ++i) {
     syncable::ModelType model_type = syncable::ModelTypeFromInt(i);
     if (!registered_types.count(model_type))
       continue;
     const wchar_t* pref_name = GetPrefNameForDataType(model_type);
@@ skipping 96 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }