Move two_phase_testserver.py and safe_browsing_testserver.py to chrome\test\data since they're test files.

This simplifies the isolate files.

R=mattm@chromium.org

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

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

6 files changed, 9 insertions, 13 deletions

diff --git a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc
index 6209da7..7a1ced5 100644
--- a/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc
+++ b/chrome/browser/safe_browsing/local_safebrowsing_test_server.cc
@@ -8,6 +8,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
+#include "chrome/common/chrome_paths.h"
 #include "net/test/python_utils.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
@@ -24,14 +25,12 @@ LocalSafeBrowsingTestServer::~LocalSafeBrowsingTestServer() {}
 bool LocalSafeBrowsingTestServer::GetTestServerPath(
     base::FilePath* testserver_path) const {
   base::FilePath testserver_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
+  if (!PathService::Get(chrome::DIR_TEST_DATA, &testserver_dir)) {
     LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
     return false;
   }
 
   testserver_dir = testserver_dir
-      .Append(FILE_PATH_LITERAL("chrome"))
-      .Append(FILE_PATH_LITERAL("browser"))
       .Append(FILE_PATH_LITERAL("safe_browsing"));
 
   *testserver_path = testserver_dir.Append(FILE_PATH_LITERAL(
diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc
index b3d4606..ace8203 100644
--- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc
+++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc
@@ -8,6 +8,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
+#include "chrome/common/chrome_paths.h"
 #include "net/test/python_utils.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
@@ -22,14 +23,12 @@ LocalTwoPhaseTestServer::~LocalTwoPhaseTestServer() {}
 bool LocalTwoPhaseTestServer::GetTestServerPath(
     base::FilePath* testserver_path) const {
   base::FilePath testserver_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &testserver_dir)) {
-    LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
+  if (!PathService::Get(chrome::DIR_TEST_DATA, &testserver_dir)) {
+    LOG(ERROR) << "Failed to get DIR_TEST_DATA";
     return false;
   }
 
   testserver_dir = testserver_dir
-      .Append(FILE_PATH_LITERAL("chrome"))
-      .Append(FILE_PATH_LITERAL("browser"))
       .Append(FILE_PATH_LITERAL("safe_browsing"));
 
   *testserver_path = testserver_dir.Append(FILE_PATH_LITERAL(
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 987ff76..48bf0c9 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -48,7 +48,6 @@
           '<(PRODUCT_DIR)/test_page.css',
           'browser/policy/test/asn1der.py',
           'browser/policy/test/policy_testserver.py',
-          'browser/safe_browsing/safe_browsing_testserver.py',
         ],
         'isolate_dependency_untracked': [
           '../content/test/data/',
diff --git a/chrome/browser/safe_browsing/safe_browsing_testserver.py b/chrome/test/data/safe_browsing/safe_browsing_testserver.py
index 8ea4de0..2946333 100755
--- a/chrome/browser/safe_browsing/safe_browsing_testserver.py
+++ b/chrome/test/data/safe_browsing/safe_browsing_testserver.py
@@ -10,7 +10,7 @@ import sys
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
-sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', 'net',
+sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', '..', 'net',
                              'tools', 'testserver'))
 import testserver_base
 
@@ -19,8 +19,8 @@ class ServerRunner(testserver_base.TestServerRunner):
   """TestServerRunner for safebrowsing_test_server.py."""
 
   def create_server(self, server_data):
-    sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', 'third_party',
-                                 'safe_browsing', 'testing'))
+    sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', '..',
+                                 'third_party', 'safe_browsing', 'testing'))
     import safebrowsing_test_server
     server = safebrowsing_test_server.SetupServer(
         self.options.data_file, self.options.host, self.options.port,
diff --git a/chrome/browser/safe_browsing/two_phase_testserver.py b/chrome/test/data/safe_browsing/two_phase_testserver.py
index b385e15..7f49a8d 100755
--- a/chrome/browser/safe_browsing/two_phase_testserver.py
+++ b/chrome/test/data/safe_browsing/two_phase_testserver.py
@@ -14,7 +14,7 @@ import urlparse
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
-sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', 'net',
+sys.path.append(os.path.join(BASE_DIR, '..', '..', '..', '..', 'net',
                              'tools', 'testserver'))
 import testserver_base
 
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 57a0803..f1f7298 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -62,7 +62,6 @@
         'isolate_dependency_tracked': [
           '../testing/test_env.py',
           '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
-          'browser/safe_browsing/two_phase_testserver.py',
         ],
         'isolate_dependency_untracked': [
           '../net/tools/testserver/',