Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2133)

Unified Diff: chrome/test/base/tracing_browsertest.cc

Issue 518583003: Don't take a fake UGI every time we execute Javascript. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix styling Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/tracing_browsertest.cc
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
index 5a6b6f4152949315b5248ed3239a3f64887dfa3f..b0b7c10be88aaaaf2fe4885e2cb9e8d40ca384dc 100644
--- a/chrome/test/base/tracing_browsertest.cc
+++ b/chrome/test/base/tracing_browsertest.cc
@@ -28,8 +28,8 @@ const char* g_event = "TheEvent";
class TracingBrowserTest : public InProcessBrowserTest {
protected:
// Execute some no-op javascript on the current tab - this triggers a trace
- // event in RenderFrameImpl::OnJavaScriptExecuteRequest (from the renderer
- // process).
+ // event in RenderFrameImpl::OnJavaScriptExecuteRequestForTests (from the
+ // renderer process).
void ExecuteJavascriptOnCurrentTab() {
content::RenderViewHost* rvh = browser()->tab_strip_model()->
GetActiveWebContents()->GetRenderViewHost();
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) {
// Child process events from same process.
ASSERT_TRUE(BeginTracingWithWatch(g_category, g_category,
- "OnJavaScriptExecuteRequest", 2));
+ "OnJavaScriptExecuteRequestForTests", 2));
ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());
ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());
EXPECT_TRUE(WaitForWatchEvent(no_timeout));
@@ -90,7 +90,7 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) {
GURL url1("chrome://tracing/");
GURL url2("chrome://credits/");
ASSERT_TRUE(BeginTracingWithWatch(g_category, g_category,
- "OnJavaScriptExecuteRequest", 2));
+ "OnJavaScriptExecuteRequestForTests", 2));
// Open two tabs to different URLs to encourage two separate renderer
// processes. Each will fire an event that will be counted towards the total.
ui_test_utils::NavigateToURLWithDisposition(browser(), url1,
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698