chrome/chrome_tests.gypi - Issue 8586009: Allow WebUI Tests to use preLoad in HtmlDialogUI.

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/chrome_tests.gypi

Issue 8586009: Allow WebUI Tests to use preLoad in HtmlDialogUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address more comments from James. Created 9 years, 1 month 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/web_ui_browsertest.cc ('k') | chrome/common/chrome_notification_types.h » ('j') | chrome/test/base/js_injection_ready_observer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_tests.gypi

diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi

index e643df38afb8a985a48a7309a3af8d0f8496da46..ef5a66c8b03320e7d8979d2daa1f750efab1d4da 100644

--- a/chrome/chrome_tests.gypi

+++ b/chrome/chrome_tests.gypi

@@ -209,6 +209,8 @@

'test/base/chrome_test_suite.h',

'test/base/in_process_browser_test.cc',

'test/base/in_process_browser_test.h',

+ 'test/base/js_injection_ready_observer.cc',

+ 'test/base/js_injection_ready_observer.h',

'test/base/model_test_utils.cc',

'test/base/model_test_utils.h',

'test/base/profile_mock.cc',

@@ -221,6 +223,8 @@

'test/base/test_launcher_utils.h',

'test/base/test_location_bar.cc',

'test/base/test_location_bar.h',

+ 'test/base/test_navigation_observer.cc',

+ 'test/base/test_navigation_observer.h',

'test/base/test_switches.cc',

'test/base/test_switches.h',

'test/base/test_tab_strip_model_observer.cc',

@@ -246,8 +250,6 @@

'test/base/ui_test_utils_win.cc',

'test/base/values_test_util.cc',

'test/base/values_test_util.h',

- 'test/test_navigation_observer.cc',

- 'test/test_navigation_observer.h',

# TODO: these should live here but are currently used by

# production code code in libbrowser (in chrome.gyp).

#'../content/browser/net/url_request_mock_http_job.cc',

@@ -2729,7 +2731,8 @@

'test/base/chrome_render_view_test.h',

'test/base/chrome_test_launcher.cc',

'test/data/webui/assertions.js',

- 'test/data/webui/async_gen-inl.h',

+ 'test/data/webui/async_gen.cc',

+ 'test/data/webui/async_gen.h',

'test/data/webui/async_gen.js',

'test/data/webui/certificate_viewer_dialog_test.js',

'test/data/webui/certificate_viewer_ui_test-inl.h',

@@ -2740,6 +2743,8 @@

'test/data/webui/hung_renderer_dialog_ui_test-inl.h',

'test/data/webui/mock4js_browsertest.js',

'test/data/webui/ntp4.js',

+ 'test/data/webui/print_preview.h',

+ 'test/data/webui/print_preview.cc',

'test/data/webui/print_preview.js',

'test/gpu/gpu_feature_browsertest.cc',

# TODO(craig): Rename this and run from base_unittests when the test