Revert of update chrome to handle temporary WEB_FRAME_USES_V8_LOCAL condition

extensions/renderer/script_context.cc

Index: extensions/renderer/script_context.cc
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index 8104fa07146acf81cb94b65b0e39f4fc5187cacd..9ed4c23fee41d666dc236e0ab137384866cac1a9 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -188,19 +188,12 @@
         v8::Local<v8::Primitive>(v8::Undefined(isolate())));
   }
 
-#ifdef WEB_FRAME_USES_V8_LOCAL
-  v8::Local<v8::Value>* call_args =
-      reinterpret_cast<v8::Local<v8::Value>*>(argv);
-#else
-  v8::Handle<v8::Value>* call_args = argv;
-#endif
-
   v8::Handle<v8::Object> global = v8_context()->Global();
   if (!web_frame_)
     return handle_scope.Escape(function->Call(global, argc, argv));
   return handle_scope.Escape(
       v8::Local<v8::Value>(web_frame_->callFunctionEvenIfScriptDisabled(
-          function, global, argc, call_args)));
+          function, global, argc, argv)));
 }
 
 Feature::Availability ScriptContext::GetAvailability(