Clean up the global object naming madness.

src/factory.h

Index: src/factory.h
diff --git a/src/factory.h b/src/factory.h
index cad25b552ebed2cd1b40330e8b69d79f2a91e90a..25051da051bfc2a1d731c4d04653ab6cee750b8d 100644
--- a/src/factory.h
+++ b/src/factory.h
@@ -559,15 +559,15 @@ class Factory V8_FINAL {
   }
 
   enum ApiInstanceType {
-    JavaScriptObject,
-    InnerGlobalObject,
-    OuterGlobalObject
+    JavaScriptObjectType,
+    GlobalObjectType,
+    GlobalProxyType
   };
 
   Handle<JSFunction> CreateApiFunction(
       Handle<FunctionTemplateInfo> data,
       Handle<Object> prototype,
-      ApiInstanceType type = JavaScriptObject);
+      ApiInstanceType type = JavaScriptObjectType);
 
   Handle<JSFunction> InstallMembers(Handle<JSFunction> function);