Remove preprocess hack now that WebKit has been updated....

webkit/glue/glue_serialize.cc

 // Copyright (c) 2010 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 "webkit/glue/glue_serialize.h"
 
 #include <string>
 
 #include "base/pickle.h"
 #include "base/utf_string_conversions.h"
@@ skipping 43 matching lines @@
 // 5: Adds support for empty FormData
 // 6: Adds support for documentSequenceNumbers
 // 7: Adds support for stateObject
 // 8: Adds support for file range and modification time
 // 9: Adds support for itemSequenceNumbers
 // Should be const, but unit tests may modify it.
 //
 // NOTE: If the version is -1, then the pickle contains only a URL string.
 // See CreateHistoryStateForURL.
 //
-#if defined(WEBKIT_BUG_40451_IS_FIXED)
 int kVersion = 9;
-#else
-int kVersion = 8;
-#endif
 
 // A bunch of convenience functions to read/write to SerializeObjects.
 // The serializers assume the input data is in the correct format and so does
 // no error checking.
 inline void WriteData(const void* data, int length, SerializeObject* obj) {
   obj->pickle.WriteData(static_cast<const char*>(data), length);
 }
 
 inline void ReadData(const SerializeObject* obj, const void** data,
                      int* length) {
@@ skipping 225 matching lines @@
   WriteString(item.alternateTitle(), obj);
   WriteReal(item.lastVisitedTime(), obj);
   WriteInteger(item.scrollOffset().x, obj);
   WriteInteger(item.scrollOffset().y, obj);
   WriteBoolean(item.isTargetItem(), obj);
   WriteInteger(item.visitCount(), obj);
   WriteString(item.referrer(), obj);
 
   WriteStringVector(item.documentState(), obj);
 
-#if defined(WEBKIT_BUG_40451_IS_FIXED)
   if (kVersion >= 9)
     WriteInteger64(item.itemSequenceNumber(), obj);
-#endif
   if (kVersion >= 6)
     WriteInteger64(item.documentSequenceNumber(), obj);
   if (kVersion >= 7) {
     bool has_state_object = !item.stateObject().isNull();
     WriteBoolean(has_state_object, obj);
     if (has_state_object)
       WriteString(item.stateObject().toString(), obj);
   }
 
   // Yes, the referrer is written twice.  This is for backwards
@@ skipping 39 matching lines @@
   item.setLastVisitedTime(ReadReal(obj));
   int x = ReadInteger(obj);
   int y = ReadInteger(obj);
   item.setScrollOffset(WebPoint(x, y));
   item.setIsTargetItem(ReadBoolean(obj));
   item.setVisitCount(ReadInteger(obj));
   item.setReferrer(ReadString(obj));
 
   item.setDocumentState(ReadStringVector(obj));
 
-#if defined(WEBKIT_BUG_40451_IS_FIXED)
   if (obj->version >= 9)
     item.setItemSequenceNumber(ReadInteger64(obj));
-#endif
   if (obj->version >= 6)
     item.setDocumentSequenceNumber(ReadInteger64(obj));
   if (obj->version >= 7) {
     bool has_state_object = ReadBoolean(obj);
     if (has_state_object) {
       item.setStateObject(
           WebSerializedScriptValue::fromString(ReadString(obj)));
     }
   }
 
@@ skipping 81 matching lines @@
   const WebHistoryItem& item = HistoryItemFromString(content_state, false);
   if (item.isNull()) {
     // Couldn't parse the string, return an empty string.
     return std::string();
   }
 
   return HistoryItemToString(item);
 }
 
 }  // namespace webkit_glue