Move debug_stub_browser_tests.py and gdb_rsp.py to chrome\test\data s…

…ince that's where files that are used by tests live. R=halyavin@google.com Review URL: https://codereview.chromium.org/426793003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286202 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jul 29, 2014 · 714cfff · 714cfff
1 parent 4473068
commit 714cfff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -8,6 +8,7 @@
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/test/ppapi/ppapi_test.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/common/nacl_switches.h"
@@ -37,9 +38,8 @@ void NaClGdbDebugStubTest::StartTestScript(base::ProcessHandle* test_process,
   // We call python script to reuse GDB RSP protocol implementation.
   CommandLine cmd(base::FilePath(FILE_PATH_LITERAL("python")));
   base::FilePath script;
-  PathService::Get(base::DIR_SOURCE_ROOT, &script);
-  script = script.AppendASCII(
-      "chrome/browser/nacl_host/test/debug_stub_browser_tests.py");
+  PathService::Get(chrome::DIR_TEST_DATA, &script);
+  script = script.AppendASCII("nacl/debug_stub_browser_tests.py");
   cmd.AppendArgPath(script);
   cmd.AppendArg(base::IntToString(debug_stub_port));
   cmd.AppendArg(test_name);

diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
@@ -30,14 +30,6 @@
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          'browser/nacl_host/test/debug_stub_browser_tests.py',
-          'browser/nacl_host/test/gdb_rsp.py',
-        ],
-      },
-    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'isolate_dependency_tracked': [
@@ -57,7 +49,6 @@
           'browser/policy/test/asn1der.py',
           'browser/policy/test/policy_testserver.py',
           'browser/safe_browsing/safe_browsing_testserver.py',
-          'common/extensions/docs/examples/apps/calculator/',
         ],
         'isolate_dependency_untracked': [
           '../content/test/data/',
@@ -76,7 +67,7 @@
           '<(PRODUCT_DIR)/remoting/unittests/',
           '<(PRODUCT_DIR)/test_data/',
           '<(PRODUCT_DIR)/test_url_loader_data/',
-          'common/extensions/docs/examples/apps/calculator/tests/',
+          'common/extensions/docs/examples/apps/calculator/',
           'test/data/',
           'third_party/mock4js/',
         ],
@@ -135,8 +126,6 @@
           'tools/build/repack_locales.py',
         ],
         'isolate_dependency_untracked': [
-          '../third_party/npapi/npspy/extern/plugin/',
-          '../third_party/psyco_win32/psyco/',
           '<(PRODUCT_DIR)/plugins/',
         ],
       },

diff --git a/...acl_host/test/debug_stub_browser_tests.py → ...est/data/nacl/debug_stub_browser_tests.py b/...acl_host/test/debug_stub_browser_tests.py → ...est/data/nacl/debug_stub_browser_tests.py
diff --git a/chrome/browser/nacl_host/test/gdb_rsp.py → chrome/test/data/nacl/gdb_rsp.py b/chrome/browser/nacl_host/test/gdb_rsp.py → chrome/test/data/nacl/gdb_rsp.py
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
@@ -18,6 +18,7 @@
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/win/windows_version.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 #include "components/nacl/browser/nacl_browser.h"
@@ -263,9 +264,8 @@ class NaClBrowserTestPnaclDebug : public NaClBrowserTestPnacl {
     // lets the app continue, so that the load progress event completes.
     CommandLine cmd(base::FilePath(FILE_PATH_LITERAL("python")));
     base::FilePath script;
-    PathService::Get(base::DIR_SOURCE_ROOT, &script);
-    script = script.AppendASCII(
-        "chrome/browser/nacl_host/test/debug_stub_browser_tests.py");
+    PathService::Get(chrome::DIR_TEST_DATA, &script);
+    script = script.AppendASCII("nacl/debug_stub_browser_tests.py");
     cmd.AppendArgPath(script);
     cmd.AppendArg(base::IntToString(debug_stub_port));
     cmd.AppendArg("continue");