| Index: sync/internal_api/read_node.cc
|
| diff --git a/sync/internal_api/read_node.cc b/sync/internal_api/read_node.cc
|
| index 9f3178170d0afba63a31fe218ca983ae9962bd8a..84fe4b55eb3389606527180b5747932161c02106 100644
|
| --- a/sync/internal_api/read_node.cc
|
| +++ b/sync/internal_api/read_node.cc
|
| @@ -44,15 +44,14 @@ BaseNode::InitByLookupResult ReadNode::InitByIdLookup(int64 id) {
|
| return INIT_FAILED_ENTRY_NOT_GOOD;
|
| if (entry_->Get(syncable::IS_DEL))
|
| return INIT_FAILED_ENTRY_IS_DEL;
|
| - syncer::ModelType model_type = GetModelType();
|
| - LOG_IF(WARNING, model_type == syncer::UNSPECIFIED ||
|
| - model_type == syncer::TOP_LEVEL_FOLDER)
|
| + ModelType model_type = GetModelType();
|
| + LOG_IF(WARNING, model_type == UNSPECIFIED || model_type == TOP_LEVEL_FOLDER)
|
| << "SyncAPI InitByIdLookup referencing unusual object.";
|
| return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
|
| }
|
|
|
| BaseNode::InitByLookupResult ReadNode::InitByClientTagLookup(
|
| - syncer::ModelType model_type,
|
| + ModelType model_type,
|
| const std::string& tag) {
|
| DCHECK(!entry_) << "Init called twice";
|
| if (tag.empty())
|
| @@ -88,9 +87,8 @@ BaseNode::InitByLookupResult ReadNode::InitByTagLookup(
|
| return INIT_FAILED_ENTRY_NOT_GOOD;
|
| if (entry_->Get(syncable::IS_DEL))
|
| return INIT_FAILED_ENTRY_IS_DEL;
|
| - syncer::ModelType model_type = GetModelType();
|
| - LOG_IF(WARNING, model_type == syncer::UNSPECIFIED ||
|
| - model_type == syncer::TOP_LEVEL_FOLDER)
|
| + ModelType model_type = GetModelType();
|
| + LOG_IF(WARNING, model_type == UNSPECIFIED || model_type == TOP_LEVEL_FOLDER)
|
| << "SyncAPI InitByTagLookup referencing unusually typed object.";
|
| return DecryptIfNecessary() ? INIT_OK : INIT_FAILED_DECRYPT_IF_NECESSARY;
|
| }
|
|
|