chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc - Issue 12084029: Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

Issue 12084029: Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head Created 7 years, 11 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/webui/net_internals/net_internals_ui_browsertest.h ('k') | chrome/browser/ui/webui/ntp/most_visited_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

===================================================================

--- chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc (revision 179251)

+++ chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc (working copy)

@@ -15,7 +15,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/tabs/tab_strip_model.h"

-#include "chrome/browser/ui/webui/web_ui_browsertest.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/ui_test_utils.h"

#include "content/public/browser/render_view_host.h"

@@ -345,6 +344,7 @@

}

void NetInternalsTest::SetUpOnMainThread() {

+ WebUIBrowserTest::SetUpOnMainThread();

// Increase the memory allowed in a prerendered page above normal settings,

// as debug builds use more memory and often go over the usual limit.

Profile* profile = browser()->profile();