Sync: Clear IS_UNSYNCED for deleted local items

sync/engine/process_updates_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_updates_command.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/location.h"
@@ skipping 102 matching lines @@
   // We need to run the Verify checks again; the world could have changed
   // since VerifyUpdatesCommand.
   if (!ReverifyEntry(trans, update, &target_entry)) {
     return SUCCESS_PROCESSED;  // The entry has become irrelevant.
   }
 
   // If we're repurposing an existing local entry with a new server ID,
   // change the ID now, after we're sure that the update can succeed.
   if (local_id != server_id) {
     DCHECK(!update.deleted());
-    SyncerUtil::ChangeEntryIDAndUpdateChildren(trans, &target_entry,
-        server_id);
+    ChangeEntryIDAndUpdateChildren(trans, &target_entry, server_id);
     // When IDs change, versions become irrelevant.  Forcing BASE_VERSION
     // to zero would ensure that this update gets applied, but would indicate
     // creation or undeletion if it were committed that way.  Instead, prefer
     // forcing BASE_VERSION to entry.version() while also forcing
     // IS_UNAPPLIED_UPDATE to true.  If the item is UNSYNCED, it's committable
     // from the new state; it may commit before the conflict resolver gets
     // a crack at it.
     if (target_entry.Get(syncable::IS_UNSYNCED) ||
         target_entry.Get(syncable::BASE_VERSION) > 0) {
       // If either of these conditions are met, then we can expect valid client
@@ skipping 39 matching lines @@
     target_entry.Put(syncable::BASE_SERVER_SPECIFICS,
                      sync_pb::EntitySpecifics());
   }
 
   SyncerUtil::UpdateServerFieldsFromUpdate(&target_entry, update, name);
 
   return SUCCESS_PROCESSED;
 }
 
 }  // namespace browser_sync