Changed DB to store node positions as Ordinals.

sync/syncable/entry.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.
 
 #include "sync/syncable/entry.h"
 
 #include <iomanip>
 
-#include "net/base/escape.h"
+#include "base/json/string_escape.h"
 #include "sync/syncable/base_transaction.h"
 #include "sync/syncable/blob.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/syncable_columns.h"
 
 using std::string;
 
 namespace syncer {
 namespace syncable {
 
@@ skipping 100 matching lines @@
   os << "Flags: ";
   for ( ; i < BIT_FIELDS_END; ++i) {
     if (kernel->ref(static_cast<BitField>(i)))
       os << g_metas_columns[i].name << ", ";
   }
   for ( ; i < STRING_FIELDS_END; ++i) {
     const std::string& field = kernel->ref(static_cast<StringField>(i));
     os << g_metas_columns[i].name << ": " << field << ", ";
   }
   for ( ; i < PROTO_FIELDS_END; ++i) {
+    std::string escaped_str;
+    base::JsonDoubleQuote(
+        kernel->ref(static_cast<ProtoField>(i)).SerializeAsString(),
+        false,
+        &escaped_str);
     os << g_metas_columns[i].name << ": "
-       << net::EscapePath(
-              kernel->ref(static_cast<ProtoField>(i)).SerializeAsString())
+       << escaped_str
+       << ", ";

[akalin, 2012/10/08 23:04:10]

can probably just put this on previous line (and maybe on the line before that,
if it fits)

+  }
+  for ( ; i < ORDINAL_FIELDS_END; ++i) {
+    os << g_metas_columns[i].name << ": "
+       << kernel->ref(static_cast<OrdinalField>(i)).ToDebugString()
        << ", ";
   }
   os << "TempFlags: ";
   for ( ; i < BIT_TEMPS_END; ++i) {
     if (kernel->ref(static_cast<BitTemp>(i)))
       os << "#" << i - BIT_TEMPS_BEGIN << ", ";
   }
   return os;
 }
 
 }  // namespace syncable
 }  // namespace syncer