Merge (7265, 7271] from bleeding_edge to experimental/gc branch....

src/scopes.h

Index: src/scopes.h
===================================================================
--- src/scopes.h	(revision 7563)
+++ src/scopes.h	(working copy)
@@ -228,7 +228,7 @@
   // A new variable proxy corresponding to the (function) receiver.
   VariableProxy* receiver() const {
     VariableProxy* proxy =
-        new VariableProxy(Factory::this_symbol(), true, false);
+        new VariableProxy(FACTORY->this_symbol(), true, false);
     proxy->BindTo(receiver_);
     return proxy;
   }
@@ -426,7 +426,7 @@
                    SerializedScopeInfo* scope_info) {
     outer_scope_ = outer_scope;
     type_ = type;
-    scope_name_ = Factory::empty_symbol();
+    scope_name_ = FACTORY->empty_symbol();
     dynamics_ = NULL;
     receiver_ = NULL;
     function_ = NULL;