[Sync] Implement encryption-aware conflict resolution.

chrome/browser/sync/syncable/syncable_columns.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_
 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_
 #pragma once
 
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_changes_version.h"
@@ skipping 39 matching lines @@
   //////////////////////////////////////
   // Strings
   {"non_unique_name", "varchar"},
   {"server_non_unique_name", "varchar(255)"},
   {"unique_server_tag", "varchar"},
   {"unique_client_tag", "varchar"},
   //////////////////////////////////////
   // Blobs.
   {"specifics", "blob"},
   {"server_specifics", "blob"},
+  {"base_server_specifics", "blob"}
 };
 
 // At least enforce that there are equal number of column names and fields.
 COMPILE_ASSERT(arraysize(g_metas_columns) >= FIELD_COUNT, missing_column_name);
 COMPILE_ASSERT(arraysize(g_metas_columns) <= FIELD_COUNT, extra_column_names);
 
 static inline const char* ColumnName(int field) {
   DCHECK(field < BEGIN_TEMPS);
   return g_metas_columns[field].name;
 }
 
 }  // namespace syncable
 
 #endif  // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_