diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | content/app/startup_helper_win.h | 10 | ||||
| -rw-r--r-- | content/content_shell.gypi | 2 | ||||
| -rw-r--r-- | content/content_tests.gypi | 4 |
4 files changed, 17 insertions, 5 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 5d385b6..95734b8 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -524,6 +524,7 @@ 'test/base/chrome_test_launcher.cc', 'test/base/view_event_test_base.cc', 'test/base/view_event_test_base.h', + '../content/app/startup_helper_win.cc', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', ], @@ -2515,6 +2516,7 @@ # TODO(craig): Rename this and run from base_unittests when the test # is safe to run there. See http://crbug.com/78722 for details. '../base/files/file_path_watcher_browsertest.cc', + '../content/app/startup_helper_win.cc', '../content/browser/child_process_security_policy_browsertest.cc', '../content/browser/device_orientation/device_orientation_browsertest.cc', '../content/browser/download/mhtml_generation_browsertest.cc', @@ -2783,6 +2785,7 @@ 'app/chrome_dll.rc', 'browser/safe_browsing/safe_browsing_test.cc', 'test/base/chrome_test_launcher.cc', + '../content/app/startup_helper_win.cc', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', ], @@ -3236,6 +3239,7 @@ 'browser/sync/test/integration/two_client_typed_urls_sync_test.cc', 'browser/sync/test/integration/typed_urls_helper.cc', 'browser/sync/test/integration/typed_urls_helper.h', + '../content/app/startup_helper_win.cc', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', ], @@ -3360,6 +3364,7 @@ 'browser/sync/test/integration/typed_urls_helper.h', 'test/base/chrome_test_launcher.cc', 'test/data/resource.rc', + '../content/app/startup_helper_win.cc', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', ], @@ -3466,6 +3471,7 @@ 'browser/gpu_crash_browsertest.cc', 'test/base/chrome_test_launcher.cc', 'test/gpu/webgl_conformance_tests.cc', + '../content/app/startup_helper_win.cc', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', '<(test_list_out_dir)/webgl_conformance_test_list_autogen.h', diff --git a/content/app/startup_helper_win.h b/content/app/startup_helper_win.h index b870798..e20b638 100644 --- a/content/app/startup_helper_win.h +++ b/content/app/startup_helper_win.h @@ -6,8 +6,6 @@ #define CONTENT_APP_STARTUP_HELPER_WIN_H_ #pragma once -#include "content/common/content_export.h" - class CommandLine; namespace sandbox { @@ -18,9 +16,11 @@ struct SandboxInterfaceInfo; // will want to call at startup. namespace content { -// Initializes the sandbox code and turns on DEP. -CONTENT_EXPORT void InitializeSandboxInfo( - sandbox::SandboxInterfaceInfo* sandbox_info); +// Initializes the sandbox code and turns on DEP. Note: This function +// must be *statically* linked into the executable (along with the static +// sandbox library); it will not work correctly if it is exported from a +// DLL and linked in. +void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info); // Register the invalid param handler and pure call handler to be able to // notify breakpad when it happens. diff --git a/content/content_shell.gypi b/content/content_shell.gypi index c818460..9709e15 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -113,11 +113,13 @@ }, 'dependencies': [ 'content_shell_lib', + '../sandbox/sandbox.gyp:sandbox', ], 'include_dirs': [ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'shell/shell_main.cc', ], 'msvs_settings': { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 3dd46d5..d991253 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -100,6 +100,7 @@ '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', '../net/net.gyp:net_test_support', + '../sandbox/sandbox.gyp:sandbox', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -114,6 +115,7 @@ '..', ], 'sources': [ + 'app/startup_helper_win.cc', 'browser/appcache/chrome_appcache_service_unittest.cc', 'browser/browser_thread_unittest.cc', 'browser/browser_url_handler_unittest.cc', @@ -229,6 +231,7 @@ 'test_support_content', '../base/base.gyp:test_support_base', '../net/net.gyp:net_test_support', + '../sandbox/sandbox.gyp:sandbox', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', @@ -241,6 +244,7 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + 'app/startup_helper_win.cc', 'test/content_browser_test.h', 'test/content_browser_test.cc', 'test/content_test_launcher.cc', |