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

Unified Diff: chrome/chrome_tests.gypi

Issue 7237030: Added options browser_tests using the generator and js handler framework. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase. Created 9 years, 5 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 93601980f47d22c7e932495e0973e7dbf016dbe6..91dcaeeffde60917560b3f5f67eb40d6bbfe56fa 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -153,6 +153,8 @@
'test/test_launcher_utils.h',
'test/test_location_bar.cc',
'test/test_location_bar.h',
+ 'test/test_navigation_observer.cc',
+ 'test/test_navigation_observer.h',
'test/test_switches.cc',
'test/test_switches.h',
'test/test_tab_strip_model_observer.cc',
@@ -2281,7 +2283,9 @@
'gypv8sh': '../tools/gypv8sh.py',
'js2webui': 'browser/ui/webui/javascript2webui.js',
'js2webui_out_dir': '<(SHARED_INTERMEDIATE_DIR)/js2webui',
+ 'mock_js': 'third_party/mock4js/mock4js.js',
'rule_input_relpath': 'test/data/webui',
+ 'test_api_js': 'test/data/webui/test_api.js',
},
'dependencies': [
'browser',
@@ -2518,8 +2522,6 @@
'browser/ui/views/html_dialog_view_browsertest.cc',
'browser/ui/webui/chrome_url_data_manager_browsertest.cc',
'browser/ui/webui/ntp/most_visited_browsertest.cc',
- 'browser/ui/webui/print_preview_browsertest.cc',
- 'browser/ui/webui/settings_browsertest.cc',
'browser/ui/webui/test_chrome_web_ui_factory_browsertest.cc',
'browser/ui/webui/BidiCheckerWebUITest.cc',
'browser/ui/webui/BidiCheckerWebUITest.h',
@@ -2545,7 +2547,7 @@
'renderer/translate_helper_browsertest.cc',
'test/automation/dom_automation_browsertest.cc',
'test/data/webui/print_preview.js',
- 'test/data/webui/sample_pass.js',
+ 'test/data/webui/options.js',
'test/gpu/gpu_browsertest.cc',
'test/in_process_browser_test_browsertest.cc',
'test/out_of_proc_test_runner.cc',
@@ -2583,7 +2585,7 @@
}, { #else: OS == "chromeos"
'sources!': [
'browser/service/service_process_control_browsertest.cc',
- 'browser/ui/webui/print_preview_browsertest.cc',
+ 'browser/ui/webui/print_preview.js',
],
}],
['file_manager_extension==0', {
@@ -2736,10 +2738,12 @@
'inputs': [
'<(gypv8sh)',
'<(PRODUCT_DIR)/v8_shell<(EXECUTABLE_SUFFIX)',
+ '<(mock_js)',
+ '<(test_api_js)',
'<(js2webui)',
],
'outputs': [
- '<(js2webui_out_dir)/js2webui/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT)-inl.h',
+ '<(js2webui_out_dir)/chrome/<(rule_input_relpath)/<(RULE_INPUT_ROOT).cc',
],
'process_outputs_as_sources': 1,
'action': [

Powered by Google App Engine
This is Rietveld 408576698