Don't take a fake UGI every time we execute Javascript.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 1206 matching lines @@
   frame_->replaceMisspelledRange(text);
 }
 
 void RenderFrameImpl::OnCSSInsertRequest(const std::string& css) {
   frame_->document().insertStyleSheet(WebString::fromUTF8(css));
 }
 
 void RenderFrameImpl::OnJavaScriptExecuteRequest(
     const base::string16& jscript,
     int id,
-    bool notify_result) {
+    bool notify_result,
+    bool set_ugi_for_tests) {

[Rick Byers, 2014/08/29 13:38:38]

I'm a little nervous that it would be too easy for some non-test code to call
this accidentally without realizing the implications.  Can you split this into
two methods without too much code duplication?

Actually, I don't see any changes here that call this function passing true. 
Why do you need this at all?

[Zeeshan Qureshi, 2014/08/29 16:16:37]

This is the method that gets called when a JavascriptExecuteRequest IPC is
received, so the method setting this true is
RenderFrameHost::ExecuteJavascriptForTests(). This function doesn't get called
directly around here too, it's used via ExecuteJavascript().

To split this into 2 would require adding a new IPC.

[Rick Byers, 2014/08/29 16:21:44]

Ah, of course - sorry, that makes sense.  I was thinking this method was public.
 Since IPCs are almost never used directly I think sharing the IPC and splitting
into separate methods immediately above that is fine.

   TRACE_EVENT_INSTANT0("test_tracing", "OnJavaScriptExecuteRequest",
                        TRACE_EVENT_SCOPE_THREAD);
 
   v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
-  v8::Handle<v8::Value> result =
-      frame_->executeScriptAndReturnValue(WebScriptSource(jscript));
+  v8::Handle<v8::Value> result = set_ugi_for_tests ?
+    frame_->executeScriptAndReturnValueForTests(WebScriptSource(jscript)) :
+    frame_->executeScriptAndReturnValue(WebScriptSource(jscript));
+
   if (notify_result) {
     base::ListValue list;
     if (!result.IsEmpty()) {
       v8::Local<v8::Context> context = frame_->mainWorldScriptContext();
       v8::Context::Scope context_scope(context);
       V8ValueConverterImpl converter;
       converter.SetDateAllowed(true);
       converter.SetRegExpAllowed(true);
       base::Value* result_value = converter.FromV8Value(result, context);
       list.Set(0, result_value ? result_value : base::Value::CreateNullValue());
@@ skipping 243 matching lines @@
 }
 
 void RenderFrameImpl::LoadURLExternally(blink::WebLocalFrame* frame,
                                         const blink::WebURLRequest& request,
                                         blink::WebNavigationPolicy policy) {
   DCHECK(!frame_ || frame_ == frame);
   loadURLExternally(frame, request, policy, WebString());
 }
 
 void RenderFrameImpl::ExecuteJavaScript(const base::string16& javascript) {
-  OnJavaScriptExecuteRequest(javascript, 0, false);
+  OnJavaScriptExecuteRequest(javascript, 0, false, false);
 }
 
 ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
   return &service_registry_;
 }
 
 bool RenderFrameImpl::IsFTPDirectoryListing() {
   WebURLResponseExtraDataImpl* extra_data =
       GetExtraDataFromResponse(frame_->dataSource()->response());
   return extra_data ? extra_data->is_ftp_directory_listing() : false;
@@ skipping 2328 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content