diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 22:43:46 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 22:43:46 +0000 |
| commit | 241632237dc0cd1343f9c8bafc92dd28252fb79f (patch) | |
| tree | ac21f2e8a787d04863589642a0f37923c2c7c31a /chrome/test | |
| parent | 9d3b06a79975a351317364dc526f4a102d679a1f (diff) | |
| download | chromium_src-241632237dc0cd1343f9c8bafc92dd28252fb79f.zip chromium_src-241632237dc0cd1343f9c8bafc92dd28252fb79f.tar.gz chromium_src-241632237dc0cd1343f9c8bafc92dd28252fb79f.tar.bz2 | |
Move injection_test_dll.h to content\common to get rid of a dependency on chrome in plugin.
TBR=nsylvain
Review URL: http://codereview.chromium.org/6695002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78112 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/injection_test_dll.h | 27 | ||||
| -rw-r--r-- | chrome/test/security_tests/security_tests.cc | 2 |
2 files changed, 1 insertions, 28 deletions
diff --git a/chrome/test/injection_test_dll.h b/chrome/test/injection_test_dll.h deleted file mode 100644 index 6240e0b..0000000 --- a/chrome/test/injection_test_dll.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_TEST_INJECTION_TEST_DLL_H__ -#define CHROME_TEST_INJECTION_TEST_DLL_H__ -#pragma once - -// This file defines the entry points for any DLL that can be loaded into the -// renderer or plugin process for the purposes of testing. The DLL code must -// define TEST_INJECTION_DLL so the entry point definitions cause the linker -// to generate exported functions. - -const char kRenderTestCall[] = "RunRendererTests"; -const char kPluginTestCall[] = "RunPluginTests"; - -extern "C" { -#ifdef TEST_INJECTION_DLL -BOOL extern __declspec(dllexport) __cdecl RunRendererTests(int* test_count); -BOOL extern __declspec(dllexport) __cdecl RunPluginTests(int* test_count); -#else -typedef BOOL (__cdecl *RunRendererTests)(int* test_count); -typedef BOOL (__cdecl *RunPluginTests)(int* test_count); -#endif -} - -#endif // CHROME_TEST_INJECTION_TEST_DLL_H__ diff --git a/chrome/test/security_tests/security_tests.cc b/chrome/test/security_tests/security_tests.cc index 33f2755..b42cc73 100644 --- a/chrome/test/security_tests/security_tests.cc +++ b/chrome/test/security_tests/security_tests.cc @@ -6,8 +6,8 @@ #include <string> #define TEST_INJECTION_DLL -#include "chrome/test/injection_test_dll.h" #include "chrome/test/security_tests/ipc_security_tests.h" +#include "content/common/injection_test_dll.h" #include "sandbox/tests/common/controller.h" #include "sandbox/tests/validation_tests/commands.h" |