Revert trunk to bleeding_edge at r12484

src/snapshot.h

Index: src/snapshot.h
diff --git a/src/snapshot.h b/src/snapshot.h
index c4ae45eee071e8a55c56ca6c63801d76969682d1..ab4529e51741a7339e54037bec8631afc76029f4 100644
--- a/src/snapshot.h
+++ b/src/snapshot.h
@@ -77,18 +77,13 @@ class Snapshot {
   static const int code_space_used_;
   static const int map_space_used_;
   static const int cell_space_used_;
-  static const int context_new_space_used_;
-  static const int context_pointer_space_used_;
-  static const int context_data_space_used_;
-  static const int context_code_space_used_;
-  static const int context_map_space_used_;
-  static const int context_cell_space_used_;
+  static const int large_space_used_;
   static const int size_;
   static const int raw_size_;
   static const int context_size_;
   static const int context_raw_size_;
 
-  static void ReserveSpaceForLinkedInSnapshot(Deserializer* deserializer);
+  static bool Deserialize(const byte* content, int len);
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Snapshot);
 };