| Index: components/sync/base/model_type.h
 | 
| diff --git a/components/sync/base/model_type.h b/components/sync/base/model_type.h
 | 
| index 8ce553ab868a52fba207658a0b281b73b924c86a..e2cddab494dec780ec5a27ab5d433622e0691c98 100644
 | 
| --- a/components/sync/base/model_type.h
 | 
| +++ b/components/sync/base/model_type.h
 | 
| @@ -164,10 +164,10 @@ enum ModelType {
 | 
|    MODEL_TYPE_COUNT,
 | 
|  };
 | 
|  
 | 
| -typedef EnumSet<ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE>
 | 
| -    ModelTypeSet;
 | 
| -typedef EnumSet<ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE> FullModelTypeSet;
 | 
| -typedef std::map<ModelType, const char*> ModelTypeNameMap;
 | 
| +using ModelTypeSet =
 | 
| +    EnumSet<ModelType, FIRST_REAL_MODEL_TYPE, LAST_REAL_MODEL_TYPE>;
 | 
| +using FullModelTypeSet = EnumSet<ModelType, UNSPECIFIED, LAST_REAL_MODEL_TYPE>;
 | 
| +using ModelTypeNameMap = std::map<ModelType, const char*>;
 | 
|  
 | 
|  inline ModelType ModelTypeFromInt(int i) {
 | 
|    DCHECK_GE(i, 0);
 | 
| 
 |