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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_shell.gypi

Issue 110533009: Import TestRunner library into chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years 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 | « android_webview/tools/webview_licenses.py ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 0031964ae62445a8244159d608c885a1cf110431..9d5ded0aa5151ee9901194d9707ab81feb82ac74 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -46,7 +46,9 @@
'../net/net.gyp:net',
'../net/net.gyp:net_resources',
'../skia/skia.gyp:skia',
- '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner',
+ '../third_party/WebKit/public/blink.gyp:blink',
+ '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_runner_resources',
+ '../third_party/WebKit/public/blink_test_runner.gyp:blink_test_support',
'../ui/events/events.gyp:events_base',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
@@ -63,6 +65,7 @@
'..',
],
'sources': [
+ 'public/test/layouttest_support.h',
'shell/android/shell_jni_registrar.cc',
'shell/android/shell_jni_registrar.h',
'shell/android/shell_manager.cc',
@@ -151,6 +154,8 @@
'shell/common/shell_switches.h',
'shell/common/shell_test_configuration.cc',
'shell/common/shell_test_configuration.h',
+ 'shell/common/test_runner/WebPreferences.cpp',
+ 'shell/common/test_runner/WebPreferences.h',
'shell/common/webkit_test_helpers.cc',
'shell/common/webkit_test_helpers.h',
'shell/geolocation/shell_access_token_store.cc',
@@ -165,8 +170,83 @@
'shell/renderer/shell_render_process_observer.h',
'shell/renderer/shell_render_view_observer.cc',
'shell/renderer/shell_render_view_observer.h',
+ 'shell/renderer/test_runner/AccessibilityController.cpp',
+ 'shell/renderer/test_runner/AccessibilityController.h',
+ 'shell/renderer/test_runner/CppBoundClass.cpp',
+ 'shell/renderer/test_runner/CppBoundClass.h',
+ 'shell/renderer/test_runner/CppVariant.cpp',
+ 'shell/renderer/test_runner/CppVariant.h',
+ 'shell/renderer/test_runner/EventSender.cpp',
+ 'shell/renderer/test_runner/EventSender.h',
+ 'shell/renderer/test_runner/GamepadController.cpp',
+ 'shell/renderer/test_runner/GamepadController.h',
+ 'shell/renderer/test_runner/KeyCodeMapping.cpp',
+ 'shell/renderer/test_runner/KeyCodeMapping.h',
+ 'shell/renderer/test_runner/MockColorChooser.cpp',
+ 'shell/renderer/test_runner/MockColorChooser.h',
+ 'shell/renderer/test_runner/MockConstraints.cpp',
+ 'shell/renderer/test_runner/MockConstraints.h',
+ 'shell/renderer/test_runner/MockGrammarCheck.cpp',
+ 'shell/renderer/test_runner/MockGrammarCheck.h',
+ 'shell/renderer/test_runner/MockSpellCheck.cpp',
+ 'shell/renderer/test_runner/MockSpellCheck.h',
+ 'shell/renderer/test_runner/MockWebAudioDevice.cpp',
+ 'shell/renderer/test_runner/MockWebAudioDevice.h',
+ 'shell/renderer/test_runner/MockWebMediaStreamCenter.cpp',
+ 'shell/renderer/test_runner/MockWebMediaStreamCenter.h',
+ 'shell/renderer/test_runner/MockWebMIDIAccessor.cpp',
+ 'shell/renderer/test_runner/MockWebMIDIAccessor.h',
+ 'shell/renderer/test_runner/MockWebRTCDataChannelHandler.cpp',
+ 'shell/renderer/test_runner/MockWebRTCDataChannelHandler.h',
+ 'shell/renderer/test_runner/MockWebRTCDTMFSenderHandler.cpp',
+ 'shell/renderer/test_runner/MockWebRTCDTMFSenderHandler.h',
+ 'shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.cpp',
+ 'shell/renderer/test_runner/MockWebRTCPeerConnectionHandler.h',
+ 'shell/renderer/test_runner/MockWebSpeechInputController.cpp',
+ 'shell/renderer/test_runner/MockWebSpeechInputController.h',
+ 'shell/renderer/test_runner/MockWebSpeechRecognizer.cpp',
+ 'shell/renderer/test_runner/MockWebSpeechRecognizer.h',
+ 'shell/renderer/test_runner/NotificationPresenter.cpp',
+ 'shell/renderer/test_runner/NotificationPresenter.h',
+ 'shell/renderer/test_runner/SpellCheckClient.cpp',
+ 'shell/renderer/test_runner/SpellCheckClient.h',
+ 'shell/renderer/test_runner/TestCommon.cpp',
+ 'shell/renderer/test_runner/TestCommon.h',
+ 'shell/renderer/test_runner/TestInterfaces.cpp',
+ 'shell/renderer/test_runner/TestInterfaces.h',
+ 'shell/renderer/test_runner/TestPlugin.cpp',
+ 'shell/renderer/test_runner/TestPlugin.h',
+ 'shell/renderer/test_runner/TestRunner.cpp',
+ 'shell/renderer/test_runner/TestRunner.h',
+ 'shell/renderer/test_runner/TextInputController.cpp',
+ 'shell/renderer/test_runner/TextInputController.h',
+ 'shell/renderer/test_runner/WebAXObjectProxy.cpp',
+ 'shell/renderer/test_runner/WebAXObjectProxy.h',
+ 'shell/renderer/test_runner/WebFrameTestProxy.h',
+ 'shell/renderer/test_runner/WebPermissions.cpp',
+ 'shell/renderer/test_runner/WebPermissions.h',
+ 'shell/renderer/test_runner/WebScopedPtr.h',
+ 'shell/renderer/test_runner/WebTask.cpp',
+ 'shell/renderer/test_runner/WebTask.h',
+ 'shell/renderer/test_runner/WebTestDelegate.h',
+ 'shell/renderer/test_runner/WebTestInterfaces.cpp',
+ 'shell/renderer/test_runner/WebTestInterfaces.h',
+ 'shell/renderer/test_runner/WebTestProxy.cpp',
+ 'shell/renderer/test_runner/WebTestProxy.h',
+ 'shell/renderer/test_runner/WebTestRunner.h',
+ 'shell/renderer/test_runner/WebTestThemeControlWin.cpp',
+ 'shell/renderer/test_runner/WebTestThemeControlWin.h',
+ 'shell/renderer/test_runner/WebTestThemeEngineMac.h',
+ 'shell/renderer/test_runner/WebTestThemeEngineMac.mm',
+ 'shell/renderer/test_runner/WebTestThemeEngineMock.cpp',
+ 'shell/renderer/test_runner/WebTestThemeEngineMock.h',
+ 'shell/renderer/test_runner/WebTestThemeEngineWin.cpp',
+ 'shell/renderer/test_runner/WebTestThemeEngineWin.h',
+ 'shell/renderer/test_runner/WebUserMediaClientMock.cpp',
+ 'shell/renderer/test_runner/WebUserMediaClientMock.h',
'shell/renderer/webkit_test_runner.cc',
'shell/renderer/webkit_test_runner.h',
+ 'test/layouttest_support.cc',
],
'msvs_settings': {
'VCLinkerTool': {
@@ -197,6 +277,10 @@
},
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
+ }, { # OS!="win"
+ 'sources/': [
+ ['exclude', 'Win\\.cpp$'],
+ ],
}], # OS=="win"
['OS=="linux"', {
'dependencies': [
« no previous file with comments | « android_webview/tools/webview_licenses.py ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698