6 files changed, 5 insertions, 33 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fcf5ba0..b6b26cab 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3384,10 +3384,10 @@
             '..',
           ],
           'sources': [
-            'test/injection_test_dll.h',
             'test/security_tests/ipc_security_tests.cc',
             'test/security_tests/ipc_security_tests.h',
             'test/security_tests/security_tests.cc',
+            '../content/common/injection_test_dll.h',
             '../sandbox/tests/validation_tests/commands.cc',
             '../sandbox/tests/validation_tests/commands.h',
           ],
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 4895b26..cec7168 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -25,7 +25,6 @@
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
-#include "chrome/test/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 02eb35d..92cf96f 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -24,7 +24,7 @@
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
-#include "chrome/test/injection_test_dll.h"
+#include "content/common/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"
@@ -143,7 +143,7 @@ int PluginMain(const MainFunctionParams& parameters) {
       }
     }
     if (sandbox_test_module) {
-      RunRendererTests run_security_tests =
+      RunPluginTests run_security_tests =
           reinterpret_cast<RunPluginTests>(GetProcAddress(sandbox_test_module,
                                                           kPluginTestCall));
       DCHECK(run_security_tests);
diff --git a/chrome/renderer/renderer_main_platform_delegate_win.cc b/chrome/renderer/renderer_main_platform_delegate_win.cc
index 0aff8e6..657bd3f 100644
--- a/chrome/renderer/renderer_main_platform_delegate_win.cc
+++ b/chrome/renderer/renderer_main_platform_delegate_win.cc
@@ -9,7 +9,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/injection_test_dll.h"
+#include "content/common/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #include "ui/gfx/native_theme_win.h"
 #include "unicode/timezone.h"
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"