Pepper: Extension for SocketPpapiTest to ppapi/.

As part of building a test framework for Pepper interactions with extensions,
we should move the extension sources under ppapi/tests.

This creates a ppapi/tests/extensions directory which will contain all of the
plugin side extensions.

SocketPpapiTest will be moved outside socket_apitest.cc in another change.

R=asargent@chromium.org, dmichael@chromium.org, yzshen@chromium.org, yzshen1
TBR=maruel
BUG=

Review URL: https://codereview.chromium.org/23540007

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

9 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/extensions/api/socket/socket_apitest.cc b/chrome/browser/extensions/api/socket/socket_apitest.cc
index e984bd5..ef334de 100644
--- a/chrome/browser/extensions/api/socket/socket_apitest.cc
+++ b/chrome/browser/extensions/api/socket/socket_apitest.cc
@@ -82,8 +82,7 @@ class SocketPpapiTest : public SocketApiTest {
     command_line->AppendSwitch("enable-pepper-testing");
 
     PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_);
-    app_dir_ = app_dir_.AppendASCII(
-        "chrome/test/data/extensions/api_test/socket/ppapi/newlib");
+    app_dir_ = app_dir_.AppendASCII("ppapi/tests/extensions/socket/newlib");
   }
 
  protected:
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index ed2a3f8..40c98f6 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -76,6 +76,7 @@
           '<(PRODUCT_DIR)/pseudo_locales/',
           '<(PRODUCT_DIR)/pyproto/',
           '<(PRODUCT_DIR)/test_data/chrome/',
+          '<(PRODUCT_DIR)/test_data/ppapi/',
           '<(PRODUCT_DIR)/test_url_loader_data/',
           'common/extensions/docs/examples/apps/calculator/tests/',
           'test/data/',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fc25bf2..a2142b6 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1584,10 +1584,10 @@
                 'test/nacl/nacl_browsertest_util.h',
               ],
               'dependencies': [
-                'test/data/extensions/api_test/api_test_data.gyp:socket_ppapi',
                 'test/data/nacl/nacl_test_data.gyp:*',
                 '../ppapi/native_client/native_client.gyp:nacl_irt',
                 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests',
+                '../ppapi/tests/extensions/extensions.gyp:ppapi_tests_extensions_socket'
               ],
             }],
             ['OS=="win" or OS=="linux"', {
diff --git a/chrome/test/data/extensions/api_test/api_test_data.gyp b/ppapi/tests/extensions/extensions.gyp
index d3ed689..d063b83f4 100644
--- a/chrome/test/data/extensions/api_test/api_test_data.gyp
+++ b/ppapi/tests/extensions/extensions.gyp
@@ -4,28 +4,28 @@
 
 {
   'includes': [
-    '../../../../../ppapi/ppapi_nacl_test_common.gypi',
+    '../../../ppapi/ppapi_nacl_test_common.gypi',
   ],
   'targets': [
     {
-      'target_name': 'socket_ppapi',
+      'target_name': 'ppapi_tests_extensions_socket',
       'type': 'none',
       'variables': {
-        'nexe_target': 'extensions_api_test_socket_ppapi',
+        'nexe_target': 'ppapi_tests_extensions_socket',
         'build_newlib': 1,
         'build_glibc': 0,
         'build_pnacl_newlib': 0,
-        'nexe_destination_dir': 'test_data/chrome/test/data/extensions/api_test/socket/ppapi',
+        'nexe_destination_dir': 'test_data/ppapi/tests/extensions/socket',
         'sources': [
-          'socket/ppapi/test_socket.cc',
+          'socket/test_socket.cc',
           '<(DEPTH)/ppapi/tests/test_utils.cc',
           '<(DEPTH)/ppapi/tests/test_utils.h',
         ],
         'test_files': [
-          'socket/ppapi/controller.js',
-          'socket/ppapi/index.html',
-          'socket/ppapi/main.js',
-          'socket/ppapi/manifest.json',
+          'socket/controller.js',
+          'socket/index.html',
+          'socket/main.js',
+          'socket/manifest.json',
         ],
       },
     },
diff --git a/chrome/test/data/extensions/api_test/socket/ppapi/controller.js b/ppapi/tests/extensions/socket/controller.js
index b6aa402..b6aa402 100644
--- a/chrome/test/data/extensions/api_test/socket/ppapi/controller.js
+++ b/ppapi/tests/extensions/socket/controller.js
diff --git a/chrome/test/data/extensions/api_test/socket/ppapi/index.html b/ppapi/tests/extensions/socket/index.html
index a7c868e..028abd6 100644
--- a/chrome/test/data/extensions/api_test/socket/ppapi/index.html
+++ b/ppapi/tests/extensions/socket/index.html
@@ -5,7 +5,7 @@
   <script src="controller.js"></script>
 </head>
 <body>
-  <embed id="nacl_module" src="extensions_api_test_socket_ppapi.nmf"
+  <embed id="nacl_module" src="ppapi_tests_extensions_socket.nmf"
       type="application/x-nacl" />
 </body>
 </html>
diff --git a/chrome/test/data/extensions/api_test/socket/ppapi/main.js b/ppapi/tests/extensions/socket/main.js
index 68957dc..68957dc 100644
--- a/chrome/test/data/extensions/api_test/socket/ppapi/main.js
+++ b/ppapi/tests/extensions/socket/main.js
diff --git a/chrome/test/data/extensions/api_test/socket/ppapi/manifest.json b/ppapi/tests/extensions/socket/manifest.json
index 635f97a..635f97a 100644
--- a/chrome/test/data/extensions/api_test/socket/ppapi/manifest.json
+++ b/ppapi/tests/extensions/socket/manifest.json
diff --git a/chrome/test/data/extensions/api_test/socket/ppapi/test_socket.cc b/ppapi/tests/extensions/socket/test_socket.cc
index 487c53f..487c53f 100644
--- a/chrome/test/data/extensions/api_test/socket/ppapi/test_socket.cc
+++ b/ppapi/tests/extensions/socket/test_socket.cc