Sync: Clear IS_UNSYNCED for deleted local items

sync/engine/process_commit_response_command.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 "sync/engine/process_commit_response_command.h"
 
 #include <cstddef>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 318 matching lines @@
       DVLOG(1) << " ID changed while committing an old entry. "
                << pre_commit_id << " became " << entry_response.id() << ".";
     }
     MutableEntry same_id(trans, GET_BY_ID, entry_response.id());
     // We should trap this before this function.
     if (same_id.good()) {
       LOG(ERROR) << "ID clash with id " << entry_response.id()
                  << " during commit " << same_id;
       return false;
     }
-    SyncerUtil::ChangeEntryIDAndUpdateChildren(
-        trans, local_entry, entry_response.id());
+    ChangeEntryIDAndUpdateChildren(trans, local_entry, entry_response.id());
     DVLOG(1) << "Changing ID to " << entry_response.id();
   }
   return true;
 }
 
 void ProcessCommitResponseCommand::UpdateServerFieldsAfterCommit(
     const sync_pb::SyncEntity& committed_entry,
     const CommitResponse_EntryResponse& entry_response,
     syncable::MutableEntry* local_entry) {
 
@@ skipping 122 matching lines @@
   // been recursively deleted.
   // TODO(nick): Here, commit_message.deleted() would be more correct than
   // local_entry->Get(IS_DEL).  For example, an item could be renamed, and then
   // deleted during the commit of the rename.  Unit test & fix.
   if (local_entry->Get(IS_DIR) && local_entry->Get(IS_DEL)) {
     deleted_folders->insert(local_entry->Get(ID));
   }
 }
 
 }  // namespace browser_sync