[Sync] Add a new global_id field to sync_pb::TabNavigation

sync/protocol/proto_value_conversions.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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "sync/protocol/proto_value_conversions.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 146 matching lines @@
 DictionaryValue* TabNavigationToValue(
     const sync_pb::TabNavigation& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET_STR(virtual_url);
   SET_STR(referrer);
   SET_STR(title);
   SET_STR(state);
   SET_ENUM(page_transition, GetPageTransitionString);
   SET_ENUM(redirect_type, GetPageTransitionRedirectTypeString);
   SET_INT32(unique_id);
-  SET_INT64(timestamp);
+  SET_INT64(timestamp_deprecated);
+  SET_INT64(local_timestamp);
   SET_BOOL(navigation_forward_back);
   SET_BOOL(navigation_from_address_bar),
   SET_BOOL(navigation_home_page);
   SET_BOOL(navigation_chain_start);
   SET_BOOL(navigation_chain_end);
   return value;
 }
 
 DictionaryValue* PasswordSpecificsDataToValue(
     const sync_pb::PasswordSpecificsData& proto) {
@@ skipping 416 matching lines @@
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 #undef SET_STR_REP
 
 #undef SET_FIELD
 
 }  // namespace syncer