Add AttachmentMetadata to Sync's EntryKernel.

sync/engine/get_commit_ids.cc

 // Copyright 2013 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/get_commit_ids.h"
 
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 87 matching lines @@
     // The local and server versions don't match. The item must be in
     // conflict, so there's no point in attempting to commit.
     DCHECK(entry.GetIsUnappliedUpdate());
     DVLOG(1) << "Excluding entry from commit due to version mismatch "
              << entry;
     return true;
   }
   return false;
 }
 
+// Return true if this entry has any attachments that haven't yet been uploaded
+// to the server.
+bool HasAttachmentNotOnServer(const syncable::Entry& entry) {
+  // TODO(maniscalco): Once AttachmentMetadata is fleshed out, implement this
+  // function to return true if any of the attachments haven't been uploaded to
+  // the server. Add test case (bug 356266).
+  return false;
+}
+
 // An entry is not considered ready for commit if any are true:
 // 1. It's in conflict.
 // 2. It requires encryption (either the type is encrypted but a passphrase
 //    is missing from the cryptographer, or the entry itself wasn't properly
 //    encrypted).
 // 3. It's type is currently throttled.
 // 4. It's a delete but has not been committed.
 bool IsEntryReadyForCommit(ModelTypeSet requested_types,
                            ModelTypeSet encrypted_types,
                            bool passphrase_missing,
@@ skipping 36 matching lines @@
     // If the root becomes unsynced it can cause us problems.
     NOTREACHED() << "Root item became unsynced " << entry;
     return false;
   }
 
   if (entry.IsRoot()) {
     NOTREACHED() << "Permanent item became unsynced " << entry;
     return false;
   }
 
+  if (HasAttachmentNotOnServer(entry)) {
+    // This entry is not ready to be sent to the server because it has one or
+    // more attachments that have not yet been uploaded to the server.  The idea
+    // here is avoid propagating an entry with dangling attachment references.
+    return false;
+  }
+
   DVLOG(2) << "Entry is ready for commit: " << entry;
   return true;
 }
 
 // Filters |unsynced_handles| to remove all entries that do not belong to the
 // specified |requested_types|, or are not eligible for a commit at this time.
 void FilterUnreadyEntries(
     syncable::BaseTransaction* trans,
     ModelTypeSet requested_types,
     ModelTypeSet encrypted_types,
     bool passphrase_missing,
     const syncable::Directory::Metahandles& unsynced_handles,
     std::set<int64>* ready_unsynced_set) {
   for (syncable::Directory::Metahandles::const_iterator iter =
        unsynced_handles.begin(); iter != unsynced_handles.end(); ++iter) {
     syncable::Entry entry(trans, syncable::GET_BY_HANDLE, *iter);
+    // TODO(maniscalco): While we check if entry is ready to be committed, we
+    // also need to check that all of its ancestors (parents, transitive) are
+    // ready to be committed.  Once attachments can prevent an entry from being
+    // committable, this method must ensure all ancestors are ready for commit
+    // (bug 356273).
     if (IsEntryReadyForCommit(requested_types,
                               encrypted_types,
                               passphrase_missing,
                               entry)) {
       ready_unsynced_set->insert(*iter);
     }
   }
 }
 
 // This class helps to implement OrderCommitIds().  Its members track the
@@ skipping 309 matching lines @@
   // Add moves and creates, and prepend their uncommitted parents.
   traversal.AddCreatesAndMoves(ready_unsynced_set);
 
   // Add all deletes.
   traversal.AddDeletes(ready_unsynced_set);
 }
 
 }  // namespace
 
 }  // namespace syncer