Revert 2324 until we can fix build and test errors.

src/factory.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 29 matching lines @@
 class Factory : public AllStatic {
  public:
   // Allocate a new fixed array with undefined entries.
   static Handle<FixedArray> NewFixedArray(
       int size,
       PretenureFlag pretenure = NOT_TENURED);
 
   // Allocate a new fixed array with non-existing entries (the hole).
   static Handle<FixedArray> NewFixedArrayWithHoles(int size);
 
-  static Handle<NumberDictionary> NewNumberDictionary(int at_least_space_for);
-
-  static Handle<StringDictionary> NewStringDictionary(int at_least_space_for);
+  static Handle<Dictionary> NewDictionary(int at_least_space_for);
 
   static Handle<DescriptorArray> NewDescriptorArray(int number_of_descriptors);
 
   static Handle<String> LookupSymbol(Vector<const char> str);
   static Handle<String> LookupAsciiSymbol(const char* str) {
     return LookupSymbol(CStrVector(str));
   }
 
 
   // String creation functions.  Most of the string creation functions take
@@ skipping 245 matching lines @@
   static Handle<String> name() { return Handle<String>(&Heap::name##_); }
   SYMBOL_LIST(SYMBOL_ACCESSOR)
 #undef SYMBOL_ACCESSOR
 
   static Handle<String> hidden_symbol() {
     return Handle<String>(&Heap::hidden_symbol_);
   }
 
   static Handle<SharedFunctionInfo> NewSharedFunctionInfo(Handle<String> name);
 
-  static Handle<NumberDictionary> DictionaryAtNumberPut(
-      Handle<NumberDictionary>,
-      uint32_t key,
-      Handle<Object> value);
+  static Handle<Dictionary> DictionaryAtNumberPut(Handle<Dictionary>,
+                                                  uint32_t key,
+                                                  Handle<Object> value);
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   static Handle<DebugInfo> NewDebugInfo(Handle<SharedFunctionInfo> shared);
 #endif
 
   // Return a map using the map cache in the global context.
   // The key the an ordered set of property names.
   static Handle<Map> ObjectLiteralMapFromCache(Handle<Context> context,
                                                Handle<FixedArray> keys);
 
@@ skipping 31 matching lines @@
   // Update the map cache in the global context with (keys, map)
   static Handle<MapCache> AddToMapCache(Handle<Context> context,
                                         Handle<FixedArray> keys,
                                         Handle<Map> map);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FACTORY_H_