Move the injection test API to content/public.

BUG=139631,98716
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10827282

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151087 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -4096,7 +4096,6 @@
             'INFOPLIST_FILE': 'test/security_tests/sandbox_tests_mac-Info.plist',
           },
           'sources': [
-            'test/security_tests/renderer_sandbox_tests_mac.h',
             'test/security_tests/renderer_sandbox_tests_mac.mm',
           ],
           'include_dirs': [
@@ -4258,7 +4257,6 @@
             '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/win/tests/validation_tests/commands.cc',
             '../sandbox/win/tests/validation_tests/commands.h',
           ],

chrome/test/DEPS

@@ -13,7 +13,6 @@ include_rules = [
   # http://crbug.com/98716
   # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW!
   "!content/common/debug_flags.h",
-  "!content/common/injection_test_dll.h",
   "!content/renderer/mock_content_renderer_client.h",
   # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST!
 

chrome/test/security_tests/renderer_sandbox_tests_mac.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/test/security_tests/renderer_sandbox_tests_mac.h"
+#import "content/public/common/injection_test_mac.h"
 
 #import <Cocoa/Cocoa.h>
 

chrome/test/security_tests/security_tests.cc

@@ -7,7 +7,7 @@
 
 #define TEST_INJECTION_DLL
 #include "chrome/test/security_tests/ipc_security_tests.h"
-#include "content/common/injection_test_dll.h"
+#include "content/public/common/injection_test_win.h"
 #include "sandbox/win/tests/common/controller.h"
 #include "sandbox/win/tests/validation_tests/commands.h"
 

chrome/test/security_tests/security_tests.gyp

@@ -13,7 +13,6 @@
       'sources': [
         '../../../sandbox/win/tests/validation_tests/commands.cc',
         '../../../sandbox/win/tests/validation_tests/commands.h',
-        '../injection_test_dll.h',
         'ipc_security_tests.cc',
         'ipc_security_tests.h',
         'security_tests.cc',

content/content_common.gypi

@@ -58,6 +58,8 @@
     'public/common/gpu_info.cc',
     'public/common/gpu_info.h',
     'public/common/gpu_performance_stats.h',
+    'public/common/injection_test_mac.h',
+    'public/common/injection_test_win.h',
     'public/common/javascript_message_type.h',
     'public/common/main_function_params.h',
     'public/common/media_stream_request.cc',

content/plugin/plugin_main.cc

@@ -22,7 +22,7 @@
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
-#include "content/common/injection_test_dll.h"
+#include "content/public/common/injection_test_win.h"
 #include "sandbox/win/src/sandbox.h"
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/global_descriptors_posix.h"

chrome/test/security_tests/renderer_sandbox_tests_mac.h → content/public/common/injection_test_mac.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_SECURITY_TESTS_RENDERER_SANDBOX_TESTS_MAC_H_
-#define CHROME_TEST_SECURITY_TESTS_RENDERER_SANDBOX_TESTS_MAC_H_
+#ifndef CONTENT_PUBLIC_COMMON_INJECTION_TEST_MAC_H_
+#define CONTENT_PUBLIC_COMMON_INJECTION_TEST_MAC_H_
 
 #import <Foundation/Foundation.h>
 
@@ -31,4 +31,4 @@ typedef void (*LogRendererSandboxTestMessage)(std::string message,
 
 @end
 
-#endif  // CHROME_TEST_SECURITY_TESTS_RENDERER_SANDBOX_TESTS_MAC_H_
+#endif  // CONTENT_PUBLIC_COMMON_INJECTION_TEST_MAC_H_

content/common/injection_test_dll.h → content/public/common/injection_test_win.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_INJECTION_TEST_DLL_H_
-#define CONTENT_COMMON_INJECTION_TEST_DLL_H_
+#ifndef CONTENT_COMMON_INJECTION_TEST_WIN_H_
+#define CONTENT_COMMON_INJECTION_TEST_WIN_H_
 
 // 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
@@ -23,4 +23,4 @@ typedef BOOL (__cdecl *RunPluginTests)(int* test_count);
 #endif
 }
 
-#endif  // CONTENT_COMMON_INJECTION_TEST_DLL_H_
+#endif  // CONTENT_COMMON_INJECTION_TEST_WIN_H_

content/renderer/DEPS

 include_rules = [
-  # TODO(avi): remove this chrome include http://crbug.com/139631
-  "+chrome/test/security_tests/renderer_sandbox_tests_mac.h",
   "+content/public/renderer",
   "+content/public/browser/native_web_keyboard_event.h", # For tests.
   "+content/public/browser/web_ui_controller_factory.h", # For tests.

content/renderer/renderer_main_platform_delegate_mac.mm

@@ -10,9 +10,9 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
-#import "chrome/test/security_tests/renderer_sandbox_tests_mac.h"
 #include "content/common/sandbox_mac.h"
 #include "content/public/common/content_switches.h"
+#import "content/public/common/injection_test_mac.h"
 #include "content/common/sandbox_init_mac.h"
 
 RendererMainPlatformDelegate::RendererMainPlatformDelegate(

content/renderer/renderer_main_platform_delegate_win.cc

@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/win_util.h"
-#include "content/common/injection_test_dll.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/injection_test_win.h"
 #include "content/public/renderer/render_thread.h"
 #include "sandbox/win/src/sandbox.h"
 #include "skia/ext/skia_sandbox_support_win.h"