In the sync database, use protobuf-based storage. Drop the old

bookmark-only columns.  Add getters and setters for BookmarkSpecifics to
syncapi as well as syncable entries.  Make the datatype be a required
property when creating a syncapi node.  Add a datatype for the 'google
chrome' top level folder.  Add database migrations from version 67 to
the new schema.  Add infrastructure to support migrations generically.
Add unit tests for the migrations.

Pull a new version of the protobuf library to pick up a fix for a
bug that this change exposed (I upstreamed the fix).

Fix some example code in the sql helpers so that it would actually
compile.

BUG=29899,30041

TEST=New unit tests for migrations: unit tests are based on actual
database dumps.  Additionally, I manually tested 2-client sync using
combos of old-protocol servers, new-protocol servers, and initial
database versions v67, v68, and v0 (new client).  I manually verified
that add/edit/delete works in these combination cases.  Afterwards I
verified (by inspecting the sync databases) that the ModelTypes are
consistent across the various migration/protocol paths.

Review URL: http://codereview.chromium.org/554066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37253 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index a4e2b47..4b45a74 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -281,8 +281,9 @@ bool BookmarkChangeProcessor::PlaceSyncNode(MoveOrCreate operation,
   bool success = false;
   if (index == 0) {
     // Insert into first position.
-    success = (operation == CREATE) ? dst->InitByCreation(sync_parent, NULL) :
-                                      dst->SetPosition(sync_parent, NULL);
+    success = (operation == CREATE) ?
+        dst->InitByCreation(syncable::BOOKMARKS, sync_parent, NULL) :
+        dst->SetPosition(sync_parent, NULL);
     if (success) {
       DCHECK_EQ(dst->GetParentId(), sync_parent.GetId());
       DCHECK_EQ(dst->GetId(), sync_parent.GetFirstChildId());
@@ -297,7 +298,7 @@ bool BookmarkChangeProcessor::PlaceSyncNode(MoveOrCreate operation,
       return false;
     }
     success = (operation == CREATE) ?
-        dst->InitByCreation(sync_parent, &sync_prev) :
+        dst->InitByCreation(syncable::BOOKMARKS, sync_parent, &sync_prev) :
         dst->SetPosition(sync_parent, &sync_prev);
     if (success) {
       DCHECK_EQ(dst->GetParentId(), sync_parent.GetId());
@@ -498,9 +499,9 @@ bool BookmarkChangeProcessor::SetBookmarkFavicon(
     sync_api::BaseNode* sync_node,
     const BookmarkNode* bookmark_node,
     Profile* profile) {
-  size_t icon_size = 0;
-  const unsigned char* icon_bytes = sync_node->GetFaviconBytes(&icon_size);
-  if (!icon_size || !icon_bytes)
+  std::vector<unsigned char> icon_bytes_vector;
+  sync_node->GetFaviconBytes(&icon_bytes_vector);
+  if (icon_bytes_vector.empty())
     return false;
 
   // Registering a favicon requires that we provide a source URL, but we
@@ -510,9 +511,6 @@ bool BookmarkChangeProcessor::SetBookmarkFavicon(
   // which does not collide with others.
   GURL fake_icon_url = bookmark_node->GetURL();
 
-  std::vector<unsigned char> icon_bytes_vector(icon_bytes,
-                                               icon_bytes + icon_size);
-
   HistoryService* history =
       profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
   FaviconService* favicon_service =
@@ -534,7 +532,7 @@ void BookmarkChangeProcessor::SetSyncNodeFavicon(
   std::vector<unsigned char> favicon_bytes;
   EncodeFavicon(bookmark_node, model, &favicon_bytes);
   if (!favicon_bytes.empty())
-    sync_node->SetFaviconBytes(&favicon_bytes[0], favicon_bytes.size());
+    sync_node->SetFaviconBytes(favicon_bytes);
 }
 
 }  // namespace browser_sync
diff --git a/chrome/browser/sync/glue/preference_change_processor.cc b/chrome/browser/sync/glue/preference_change_processor.cc
index f85ec5c..a05823b 100644
--- a/chrome/browser/sync/glue/preference_change_processor.cc
+++ b/chrome/browser/sync/glue/preference_change_processor.cc
@@ -42,7 +42,9 @@ void PreferenceChangeProcessor::Observe(NotificationType type,
       error_handler()->OnUnrecoverableError();
       return;
     }
-    if (!sync_node.InitByCreation(root_node, NULL)) {
+    // TODO(ncarter): Define and use a preferences model_type.
+    syncable::ModelType model_type = syncable::BOOKMARKS;
+    if (!sync_node.InitByCreation(model_type, root_node, NULL)) {
       LOG(ERROR) << "Preference node creation failed.";
       error_handler()->OnUnrecoverableError();
       return;