commit 4fd355cc40e2392987a17339663fa86d3c472a8d
author Yang Guo <yangguo@google.com> Thu Sep 19 10:59:03 2019 +0200
committer Yang Guo <yangguo@google.com> Mon Oct 21 08:08:56 2019 +0200
tree 2f07426c181e067eb1df3d1a66d618505193d542
parent d638d21ae7e6d2ec9d06122ebe18cdbac6cb30f2

Switch to new repository

scripts/devtools_paths.py

diff --git a/scripts/devtools_paths.py b/scripts/devtools_paths.py
index 14d721c..6a50a6d 100644
--- a/scripts/devtools_paths.py
+++ b/scripts/devtools_paths.py
@@ -21,9 +21,9 @@
     if path.basename(PARENT_PATH) == 'renderer':
         # Chromium repository
         return path.dirname(path.dirname(path.dirname(PARENT_PATH)))
-    elif path.basename(PARENT_PATH) == 'third_party':
+    elif path.basename(PARENT_PATH) == 'devtools-frontend':
         # External repository, integrated build
-        return path.dirname(PARENT_PATH)
+        return path.dirname(path.dirname(PARENT_PATH))
     else:
         # External repository, standalone build
         return ABS_DEVTOOLS_PATH
@@ -49,16 +49,7 @@
 
 
 def node_modules_path():
-    SCRIPTS_PATH = path.dirname(path.abspath(__file__))
-    ABS_DEVTOOLS_PATH = path.dirname(SCRIPTS_PATH)
-    PARENT_PATH = path.dirname(ABS_DEVTOOLS_PATH)
-    # TODO(1011259): remove Chromium repository handling
-    if path.basename(PARENT_PATH) == 'renderer':
-        # While in Chromium repo, node modules are hosted in //third_party/devtools-node-modules.
-        return path.join(root_path(), 'third_party', 'devtools-node-modules', 'third_party', 'node_modules')
-    else:
-        # In the external repo, node modules are hosted in root.
-        return path.join(root_path(), 'node_modules')
+    return path.join(DEVTOOLS_ROOT_PATH, 'node_modules')
 
 
 def eslint_path():