Add server_attachment_metadata field to EntryKernel and sync database.

sync/syncable/directory_backing_store_unittest.cc

 // Copyright 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 "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 58 matching lines @@
   void SetUpVersion79Database(sql::Connection* connection);
   void SetUpVersion80Database(sql::Connection* connection);
   void SetUpVersion81Database(sql::Connection* connection);
   void SetUpVersion82Database(sql::Connection* connection);
   void SetUpVersion83Database(sql::Connection* connection);
   void SetUpVersion84Database(sql::Connection* connection);
   void SetUpVersion85Database(sql::Connection* connection);
   void SetUpVersion86Database(sql::Connection* connection);
   void SetUpVersion87Database(sql::Connection* connection);
   void SetUpVersion88Database(sql::Connection* connection);
+  void SetUpVersion89Database(sql::Connection* connection);
 
   void SetUpCurrentDatabaseAndCheckVersion(sql::Connection* connection) {
-    SetUpVersion88Database(connection);  // Prepopulates data.
+    SetUpVersion89Database(connection);  // Prepopulates data.
     scoped_ptr<TestDirectoryBackingStore> dbs(
         new TestDirectoryBackingStore(GetUsername(), connection));
     ASSERT_EQ(kCurrentDBVersion, dbs->GetVersion());
 
     ASSERT_TRUE(LoadAndIgnoreReturnedData(dbs.get()));
     ASSERT_FALSE(dbs->needs_column_refresh_);
   }
 
  private:
   base::ScopedTempDir temp_dir_;
@@ skipping 2667 matching lines @@
          ",attachment_metadata blob);"
       "CREATE TABLE 'share_info' (id TEXT primary key, name TEXT, store_birthda"
          "y TEXT, db_create_version TEXT, db_create_time INT, next_id INT defau"
          "lt -2, cache_guid TEXT, notification_state BLOB, bag_of_chips BLOB);"
       "INSERT INTO 'share_info' VALUES('nick@chromium.org','nick@chromium.org',"
          "'c27e9f59-08ca-46f8-b0cc-f16a2ed778bb','Unknown',1263522064,-131078,'"
          "9010788312004066376x-6609234393368420856x',NULL,NULL);"));
   ASSERT_TRUE(connection->CommitTransaction());
 }
 
+
+void MigrationTest::SetUpVersion89Database(sql::Connection* connection) {
+  ASSERT_TRUE(connection->is_open());
+  ASSERT_TRUE(connection->BeginTransaction());
+  ASSERT_TRUE(connection->Execute(
+      "CREATE TABLE share_version (id VARCHAR(128) primary key, data INT);"
+      "INSERT INTO 'share_version' VALUES('nick@chromium.org',89);"
+      "CREATE TABLE models (model_id BLOB primary key, progress_marker BLOB, tr"
+         "ansaction_version BIGINT default 0, context BLOB);"
+      "INSERT INTO 'models' VALUES(X'C2881000',X'0888810218B605',1,NULL);"
+      "CREATE TABLE 'metas'(metahandle bigint primary key ON CONFLICT FAIL,base"
+         "_version bigint default -1,server_version bigint default 0,local_exte"
+         "rnal_id bigint default 0,transaction_version bigint default 0,mtime b"
+         "igint default 0,server_mtime bigint default 0,ctime bigint default 0,"
+         "server_ctime bigint default 0,id varchar(255) default 'r',parent_id v"
+         "archar(255) default 'r',server_parent_id varchar(255) default 'r',is_"
+         "unsynced bit default 0,is_unapplied_update bit default 0,is_del bit d"
+         "efault 0,is_dir bit default 0,server_is_dir bit default 0,server_is_d"
+         "el bit default 0,non_unique_name varchar,server_non_unique_name varch"
+         "ar(255),unique_server_tag varchar,unique_client_tag varchar,unique_bo"
+         "okmark_tag varchar,specifics blob,server_specifics blob,base_server_s"
+         "pecifics blob,server_unique_position blob,unique_position blob,attach"
+         "ment_metadata blob,server_attachment_metadata blob);"
+      "INSERT INTO 'metas' VALUES(1,-1,0,0,0,"
+         META_PROTO_TIMES_VALS(1)
+         ",'r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'',X'',NULL,X'2200'"
+         ",X'2200',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(6,694,694,6,0,"
+         META_PROTO_TIMES_VALS(6)
+         ",'s_ID_6','s_ID_9','s_ID_9',0,0,0,1,1,0,'The Internet','The Internet'"
+         ",NULL,NULL,X'6754307476346749735A5734654D653273625336557753582F77673D"
+         "',X'C2881000',X'C2881000',NULL,X'22247FFFFFFFFFC000006754307476346749"
+         "735A5734654D653273625336557753582F77673D',X'22247FFFFFFFFFC0000067543"
+         "07476346749735A5734654D653273625336557753582F77673D',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(7,663,663,0,0,"
+         META_PROTO_TIMES_VALS(7)
+         ",'s_ID_7','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome','google"
+         "_chrome',NULL,X'',NULL,NULL,NULL,X'2200',X'2200',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(8,664,664,0,0,"
+         META_PROTO_TIMES_VALS(8)
+         ",'s_ID_8','s_ID_7','s_ID_7',0,0,0,1,1,0,'Bookmarks','Bookmarks','goog"
+         "le_chrome_bookmarks',NULL,X'',X'C2881000',X'C2881000',NULL,X'2200',X'"
+         "2200',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(9,665,665,1,0,"
+         META_PROTO_TIMES_VALS(9)
+         ",'s_ID_9','s_ID_8','s_ID_8',0,0,0,1,1,0,'Bookmark Bar','Bookmark Bar'"
+         ",'bookmark_bar',NULL,X'',X'C2881000',X'C2881000',NULL,X'2200',X'2200'"
+         ",NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(10,666,666,2,0,"
+         META_PROTO_TIMES_VALS(10)
+         ",'s_ID_10','s_ID_8','s_ID_8',0,0,0,1,1,0,'Other Bookmarks','Other Boo"
+         "kmarks','other_bookmarks',NULL,X'',X'C2881000',X'C2881000',NULL,X'220"
+         "0',X'2200',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(11,683,683,8,0,"
+         META_PROTO_TIMES_VALS(11)
+         ",'s_ID_11','s_ID_6','s_ID_6',0,0,0,0,0,0,'Home (The Chromium Projects"
+         ")','Home (The Chromium Projects)',NULL,NULL,X'50514C784A456D623579366"
+         "267644237646A7A2B62314130346E493D',X'C28810220A18687474703A2F2F646576"
+         "2E6368726F6D69756D2E6F72672F1206414741545741',X'C28810290A1D687474703"
+         "A2F2F6465762E6368726F6D69756D2E6F72672F6F7468657212084146414756415346"
+         "',NULL,X'22247FFFFFFFFFF0000050514C784A456D623579366267644237646A7A2B"
+         "62314130346E493D',X'22247FFFFFFFFFF0000050514C784A456D623579366267644"
+         "237646A7A2B62314130346E493D',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(12,685,685,9,0,"
+         META_PROTO_TIMES_VALS(12)
+         ",'s_ID_12','s_ID_6','s_ID_6',0,0,0,1,1,0,'Extra Bookmarks','Extra Boo"
+         "kmarks',NULL,NULL,X'7867626A704A646134635A6F616C376A49513338734B46324"
+         "837773D',X'C2881000',X'C2881000',NULL,X'222480000000000000007867626A7"
+         "04A646134635A6F616C376A49513338734B46324837773D',X'222480000000000000"
+         "007867626A704A646134635A6F616C376A49513338734B46324837773D',NULL,NULL"
+         ");"
+      "INSERT INTO 'metas' VALUES(13,687,687,10,0,"
+         META_PROTO_TIMES_VALS(13)
+         ",'s_ID_13','s_ID_6','s_ID_6',0,0,0,0,0,0,'ICANN | Internet Corporatio"
+         "n for Assigned Names and Numbers','ICANN | Internet Corporation for A"
+         "ssigned Names and Numbers',NULL,NULL,X'3142756B572F774176695650417967"
+         "2B304A614A514B3452384A413D',X'C28810240A15687474703A2F2F7777772E69636"
+         "16E6E2E636F6D2F120B504E474158463041414646',X'C28810200A15687474703A2F"
+         "2F7777772E6963616E6E2E636F6D2F120744414146415346',NULL,X'22247FFFFFFF"
+         "FFF200003142756B572F7741766956504179672B304A614A514B3452384A413D',X'2"
+         "2247FFFFFFFFFF200003142756B572F7741766956504179672B304A614A514B345238"
+         "4A413D',NULL,NULL);"
+      "INSERT INTO 'metas' VALUES(14,692,692,11,0,"
+         META_PROTO_TIMES_VALS(14)
+         ",'s_ID_14','s_ID_6','s_ID_6',0,0,0,0,0,0,'The WebKit Open Source Proj"
+         "ect','The WebKit Open Source Project',NULL,NULL,X'5A5678314E797636457"
+         "9524D3177494F7236563159552F6E644C553D',X'C288101A0A12687474703A2F2F77"
+         "65626B69742E6F72672F1204504E4758',X'C288101C0A13687474703A2F2F7765626"
+         "B69742E6F72672F781205504E473259',NULL,X'222480000000001000005A5678314"
+         "E7976364579524D3177494F7236563159552F6E644C553D',X'222480000000001000"
+         "005A5678314E7976364579524D3177494F7236563159552F6E644C553D',NULL,NULL"
+         ");"
+      "CREATE TABLE deleted_metas (metahandle bigint primary key ON CONFLICT FA"
+         "IL,base_version bigint default -1,server_version bigint default 0,loc"
+         "al_external_id bigint default 0,transaction_version bigint default 0,"
+         "mtime bigint default 0,server_mtime bigint default 0,ctime bigint def"
+         "ault 0,server_ctime bigint default 0,id varchar(255) default 'r',pare"
+         "nt_id varchar(255) default 'r',server_parent_id varchar(255) default "
+         "'r',is_unsynced bit default 0,is_unapplied_update bit default 0,is_de"
+         "l bit default 0,is_dir bit default 0,server_is_dir bit default 0,serv"
+         "er_is_del bit default 0,non_unique_name varchar,server_non_unique_nam"
+         "e varchar(255),unique_server_tag varchar,unique_client_tag varchar,un"
+         "ique_bookmark_tag varchar,specifics blob,server_specifics blob,base_s"
+         "erver_specifics blob,server_unique_position blob,unique_position blob"
+         ",attachment_metadata blob,server_attachment_metadata blob);"
+      "CREATE TABLE 'share_info' (id TEXT primary key, name TEXT, store_birthda"
+         "y TEXT, db_create_version TEXT, db_create_time INT, next_id INT defau"
+         "lt -2, cache_guid TEXT, notification_state BLOB, bag_of_chips BLOB);"
+      "INSERT INTO 'share_info' VALUES('nick@chromium.org','nick@chromium.org',"
+         "'c27e9f59-08ca-46f8-b0cc-f16a2ed778bb','Unknown',1263522064,-131078,'"
+         "9010788312004066376x-6609234393368420856x',NULL,NULL);"));
+  ASSERT_TRUE(connection->CommitTransaction());
+}
+
+
 TEST_F(DirectoryBackingStoreTest, MigrateVersion67To68) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
 
   SetUpVersion67Database(&connection);
 
   // Columns existing before version 67.
   ASSERT_TRUE(connection.DoesColumnExist("metas", "name"));
   ASSERT_TRUE(connection.DoesColumnExist("metas", "unsanitized_name"));
   ASSERT_TRUE(connection.DoesColumnExist("metas", "server_name"));
@@ skipping 470 matching lines @@
   ASSERT_TRUE(connection.OpenInMemory());
   SetUpVersion87Database(&connection);
 
   scoped_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
   ASSERT_TRUE(dbs->MigrateVersion87To88());
   ASSERT_EQ(88, dbs->GetVersion());
   ASSERT_TRUE(connection.DoesColumnExist("models", "context"));
 }
 
+TEST_F(DirectoryBackingStoreTest, MigrateVersion88To89) {
+  sql::Connection connection;
+  ASSERT_TRUE(connection.OpenInMemory());
+  SetUpVersion88Database(&connection);
+  ASSERT_FALSE(
+      connection.DoesColumnExist("metas", "server_attachment_metadata"));
+
+  scoped_ptr<TestDirectoryBackingStore> dbs(
+      new TestDirectoryBackingStore(GetUsername(), &connection));
+  ASSERT_TRUE(dbs->MigrateVersion88To89());
+  ASSERT_EQ(89, dbs->GetVersion());
+  EXPECT_TRUE(
+      connection.DoesColumnExist("metas", "server_attachment_metadata"));
+  EXPECT_TRUE(dbs->needs_column_refresh_);
+}
+
 // The purpose of this test case is to make it easier to get a dump of the
 // database so you can implement a SetUpVersionYDatabase method.  Here's what
 // you should do:
 //
 //   1. Say you're going from version X to version Y.  Write the migration
 //      method MigrateVersionXToY.
 //   2. Update the test below to call SetUpVersionXDatabase and then
 //      MigrateVersionXToY. You now have a database at version Y. Let's dump it.
 //   3. Set a breakpoint to stop execution just after the connection is
 //      destroyed.  Examine temp_dir_ to find the version Y database that was
 //      created on disk. E.g. (gdb) p temp_dir_.path().value().c_str()
 //   4. Dump the database using the sqlite3 command line tool:
 //        > .output foo_dump.sql
 //        > .dump
 //   5. Replace the timestamp columns with META_PROTO_TIMES(x) (or
 //      LEGACY_META_PROTO_TIMES(x) if before Version 77). Use this dump to write
 //      a SetupVersionYDatabase method.
 TEST_F(DirectoryBackingStoreTest, MigrateToLatestAndDump) {
   {
     sql::Connection connection;
     ASSERT_TRUE(connection.Open(GetDatabasePath()));
-    SetUpVersion87Database(&connection);  // Update this.
+    SetUpVersion88Database(&connection);  // Update this.
 
     scoped_ptr<TestDirectoryBackingStore> dbs(
         new TestDirectoryBackingStore(GetUsername(), &connection));
-    ASSERT_TRUE(dbs->MigrateVersion87To88());  // Update this.
+    ASSERT_TRUE(dbs->MigrateVersion88To89());  // Update this.
     ASSERT_TRUE(LoadAndIgnoreReturnedData(dbs.get()));
-    EXPECT_EQ(88, dbs->GetVersion());  // Update this.
+    EXPECT_EQ(89, dbs->GetVersion());  // Update this.
     ASSERT_FALSE(dbs->needs_column_refresh_);
   }
   // Set breakpoint here.
 }
 
 TEST_F(DirectoryBackingStoreTest, DetectInvalidPosition) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
   SetUpVersion86Database(&connection);
 
@@ skipping 81 matching lines @@
       break;
     case 86:
       SetUpVersion86Database(&connection);
       break;
     case 87:
       SetUpVersion87Database(&connection);
       break;
     case 88:
       SetUpVersion88Database(&connection);
       break;
+    case 89:
+      SetUpVersion89Database(&connection);
+      break;
     default:
       // If you see this error, it may mean that you've increased the
       // database version number but you haven't finished adding unit tests
       // for the database migration code.  You need to need to supply a
       // SetUpVersionYDatabase function with a dump of the test database
       // at the new schema.  See the MigrateToLatestAndDump test case.
       FAIL() << "Need to supply database dump for version " << GetParam();
   }
 
   syncable::Directory::KernelLoadInfo dir_info;
@@ skipping 72 matching lines @@
   ASSERT_FALSE(connection.DoesColumnExist("metas", "next_id"));
   ASSERT_FALSE(connection.DoesColumnExist("metas", "prev_id"));
   ASSERT_FALSE(connection.DoesColumnExist("metas", "server_ordinal_in_parent"));
 
   // Column added in version 87.
   ASSERT_TRUE(connection.DoesColumnExist("metas", "attachment_metadata"));
 
   // Column added in version 88.
   ASSERT_TRUE(connection.DoesColumnExist("models", "context"));
 
+  // Column added in version 89.
+  ASSERT_TRUE(
+      connection.DoesColumnExist("metas", "server_attachment_metadata"));
+
   // Check download_progress state (v75 migration)
   ASSERT_EQ(694,
       dir_info.kernel_info.download_progress[BOOKMARKS]
       .timestamp_token_for_migration());
   ASSERT_FALSE(
       dir_info.kernel_info.download_progress[BOOKMARKS]
       .has_token());
   ASSERT_EQ(32904,
       dir_info.kernel_info.download_progress[BOOKMARKS]
       .data_type_id());
@@ skipping 16 matching lines @@
   ExpectTimes(handles_map, GetExpectedMetaTimes());
 
   Directory::MetahandlesMap::iterator it = handles_map.find(1);
   ASSERT_TRUE(it != handles_map.end());
   ASSERT_EQ(1, it->second->ref(META_HANDLE));
   EXPECT_TRUE(it->second->ref(ID).IsRoot());
   EXPECT_FALSE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_FALSE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(UNIQUE_BOOKMARK_TAG).empty());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   // Items 2, 4, and 5 were deleted.
   it = handles_map.find(2);
   ASSERT_TRUE(it == handles_map.end());
   it = handles_map.find(4);
   ASSERT_TRUE(it == handles_map.end());
   it = handles_map.find(5);
   ASSERT_TRUE(it == handles_map.end());
 
   it = handles_map.find(6);
   ASSERT_EQ(6, it->second->ref(META_HANDLE));
   EXPECT_TRUE(it->second->ref(IS_DIR));
   EXPECT_TRUE(it->second->ref(SERVER_IS_DIR));
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_favicon());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_favicon());
   EXPECT_TRUE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_EQ(UniquePosition::kSuffixLength,
             it->second->ref(UNIQUE_BOOKMARK_TAG).length());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(7);
   ASSERT_EQ(7, it->second->ref(META_HANDLE));
   EXPECT_EQ("google_chrome", it->second->ref(UNIQUE_SERVER_TAG));
   EXPECT_FALSE(it->second->ref(SPECIFICS).has_bookmark());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   // Make sure we didn't assign positions to google_chrome.
   EXPECT_FALSE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_FALSE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(UNIQUE_BOOKMARK_TAG).empty());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(8);
   ASSERT_EQ(8, it->second->ref(META_HANDLE));
   EXPECT_EQ("google_chrome_bookmarks", it->second->ref(UNIQUE_SERVER_TAG));
   EXPECT_TRUE(it->second->ref(SPECIFICS).has_bookmark());
   EXPECT_TRUE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   ASSERT_EQ(it->second->ref(ID).value(), "s_ID_8");
   // Make sure we didn't mistake the bookmark root node for a real bookmark.
   EXPECT_FALSE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_FALSE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(UNIQUE_BOOKMARK_TAG).empty());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(9);
   ASSERT_EQ(9, it->second->ref(META_HANDLE));
   EXPECT_EQ("bookmark_bar", it->second->ref(UNIQUE_SERVER_TAG));
   EXPECT_TRUE(it->second->ref(SPECIFICS).has_bookmark());
   EXPECT_TRUE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   // Make sure we didn't assign positions to bookmark_bar.
   EXPECT_FALSE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_FALSE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(UNIQUE_BOOKMARK_TAG).empty());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(10);
   ASSERT_EQ(10, it->second->ref(META_HANDLE));
   EXPECT_FALSE(it->second->ref(IS_DEL));
   EXPECT_TRUE(it->second->ref(SPECIFICS).has_bookmark());
   EXPECT_TRUE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_favicon());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_favicon());
   EXPECT_EQ("other_bookmarks", it->second->ref(UNIQUE_SERVER_TAG));
   EXPECT_EQ("Other Bookmarks", it->second->ref(NON_UNIQUE_NAME));
   EXPECT_EQ("Other Bookmarks", it->second->ref(SERVER_NON_UNIQUE_NAME));
   ASSERT_EQ(it->second->ref(ID).value(), "s_ID_10");
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
   // Make sure we didn't assign positions to server-created folders, either.
   EXPECT_FALSE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_FALSE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(UNIQUE_BOOKMARK_TAG).empty());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(11);
   ASSERT_EQ(11, it->second->ref(META_HANDLE));
   EXPECT_FALSE(it->second->ref(IS_DEL));
   EXPECT_FALSE(it->second->ref(IS_DIR));
   EXPECT_TRUE(it->second->ref(SPECIFICS).has_bookmark());
   EXPECT_TRUE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   EXPECT_EQ("http://dev.chromium.org/",
             it->second->ref(SPECIFICS).bookmark().url());
   EXPECT_EQ("AGATWA", it->second->ref(SPECIFICS).bookmark().favicon());
@@ skipping 20 matching lines @@
   EXPECT_TRUE(it->second->ref(SERVER_SPECIFICS).has_bookmark());
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_url());
   EXPECT_FALSE(it->second->ref(SPECIFICS).bookmark().has_favicon());
   EXPECT_FALSE(it->second->ref(SERVER_SPECIFICS).bookmark().has_favicon());
   EXPECT_TRUE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_EQ(UniquePosition::kSuffixLength,
             it->second->ref(UNIQUE_BOOKMARK_TAG).length());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(13);
   ASSERT_EQ(13, it->second->ref(META_HANDLE));
   EXPECT_TRUE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_EQ(UniquePosition::kSuffixLength,
             it->second->ref(UNIQUE_BOOKMARK_TAG).length());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   it = handles_map.find(14);
   ASSERT_EQ(14, it->second->ref(META_HANDLE));
   EXPECT_TRUE(it->second->ref(UNIQUE_POSITION).IsValid());
   EXPECT_TRUE(it->second->ref(SERVER_UNIQUE_POSITION).IsValid());
   EXPECT_EQ(UniquePosition::kSuffixLength,
             it->second->ref(UNIQUE_BOOKMARK_TAG).length());
   EXPECT_TRUE(it->second->ref(ATTACHMENT_METADATA).IsInitialized());
+  EXPECT_TRUE(it->second->ref(SERVER_ATTACHMENT_METADATA).IsInitialized());
 
   ASSERT_EQ(static_cast<size_t>(10), handles_map.size());
 
   // Make sure that the syncable::Directory and the migration code agree on
   // which items should or should not have unique position values.  This test
   // may become obsolete if the directory's definition of that function
   // changes, but, until then, this is a useful test.
   for (it = handles_map.begin(); it != handles_map.end(); it++) {
     SCOPED_TRACE(it->second->ref(ID));
     if (it->second->ShouldMaintainPosition()) {
@@ skipping 143 matching lines @@
   const std::string& guid2 = TestDirectoryBackingStore::GenerateCacheGUID();
   EXPECT_EQ(24U, guid1.size());
   EXPECT_EQ(24U, guid2.size());
   // In theory this test can fail, but it won't before the universe
   // dies of heat death.
   EXPECT_NE(guid1, guid2);
 }
 
 }  // namespace syncable
 }  // namespace syncer