From cc2294d9b724c5b7a08941b958cdf17c0c917d6e Mon Sep 17 00:00:00 2001
From: Mirko Bonadei <mbonadei@webrtc.org>
Date: Thu, 2 Sep 2021 09:59:44 +0200
Subject: [PATCH] Remove references to xstream from WebRTC codebase.

No-Presubmit: True
Bug: chromium:1245605
Change-Id: I02e9459c0a41c95e8ae08551350d1a5f4ca6cb64
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231121
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34900}
---
 .../autoroller/unittests/roll_deps_test.py    | 19 ++++++++++---------
 .../unittests/testdata/roll_deps/DEPS         | 18 +++++++++---------
 .../testdata/roll_deps/DEPS.chromium.new      | 19 +++++++++----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/tools_webrtc/autoroller/unittests/roll_deps_test.py b/tools_webrtc/autoroller/unittests/roll_deps_test.py
index 8f1e732ca4..87863bb04f 100755
--- a/tools_webrtc/autoroller/unittests/roll_deps_test.py
+++ b/tools_webrtc/autoroller/unittests/roll_deps_test.py
@@ -202,15 +202,16 @@ class TestRollChromiumRevision(unittest.TestCase):
         self.assertEquals(changed_deps[0].current_rev, BUILD_OLD_REV)
         self.assertEquals(changed_deps[0].new_rev, BUILD_NEW_REV)
 
-        self.assertEquals(changed_deps[1].path, 'src/third_party/depot_tools')
-        self.assertEquals(changed_deps[1].current_rev, DEPOTTOOLS_OLD_REV)
-        self.assertEquals(changed_deps[1].new_rev, DEPOTTOOLS_NEW_REV)
+        self.assertEquals(changed_deps[1].path, 'src/buildtools/linux64')
+        self.assertEquals(changed_deps[1].package, 'gn/gn/linux-amd64')
+        self.assertEquals(changed_deps[1].current_version,
+            'git_revision:69ec4fca1fa69ddadae13f9e6b7507efa0675263')
+        self.assertEquals(changed_deps[1].new_version,
+            'git_revision:new-revision')
 
-        self.assertEquals(changed_deps[2].path, 'src/third_party/xstream')
-        self.assertEquals(changed_deps[2].package,
-                          'chromium/third_party/xstream')
-        self.assertEquals(changed_deps[2].current_version, 'version:1.4.8-cr0')
-        self.assertEquals(changed_deps[2].new_version, 'version:1.10.0-cr0')
+        self.assertEquals(changed_deps[2].path, 'src/third_party/depot_tools')
+        self.assertEquals(changed_deps[2].current_rev, DEPOTTOOLS_OLD_REV)
+        self.assertEquals(changed_deps[2].new_rev, DEPOTTOOLS_NEW_REV)
 
     def testWithDistinctDeps(self):
         """Check CalculateChangedDeps still works when deps are added/removed. """
@@ -257,7 +258,7 @@ class TestRollChromiumRevision(unittest.TestCase):
         _, other_paths = FindRemovedDeps(webrtc_deps, new_cr_deps)
         self.assertEquals(
             other_paths,
-            ['src/third_party/xstream', 'src/third_party/depot_tools'])
+            ['src/buildtools/linux64', 'src/third_party/depot_tools'])
 
     def testExpectedDepsIsNotReportedMissing(self):
         """Some deps musn't be seen as missing, even if absent from Chromium."""
diff --git a/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS b/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS
index 6eddc130bf..c39af68a9e 100644
--- a/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS
+++ b/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS
@@ -15,15 +15,15 @@ deps = {
       Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'b9ae2ca9a55d9b754c313f4c9e9f0f3b804a5e44',
 
   # Entry that's also a CIPD entry in the Chromium DEPS file.
-  'src/third_party/xstream': {
-      'packages': [
-          {
-              'package': 'chromium/third_party/xstream',
-              'version': 'version:1.4.8-cr0',
-          },
-      ],
-      'condition': 'checkout_android',
-      'dep_type': 'cipd',
+  'src/buildtools/linux64': {
+    'packages': [
+      {
+        'package': 'gn/gn/linux-amd64',
+        'version': 'git_revision:69ec4fca1fa69ddadae13f9e6b7507efa0675263',
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'checkout_linux',
   },
 
   # Script expects to find these markers.
diff --git a/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS.chromium.new b/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS.chromium.new
index 1c00f9aa35..7d40e425d5 100644
--- a/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS.chromium.new
+++ b/tools_webrtc/autoroller/unittests/testdata/roll_deps/DEPS.chromium.new
@@ -11,16 +11,15 @@ deps = {
   'src/third_party/depot_tools':
     Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' +  Var('depot_tools_revision'),
 
-  'src/third_party/xstream': {
-      'packages': [
-          {
-              'package': 'chromium/third_party/xstream',
-              # This is updated compared to the DEPS file.
-              'version': 'version:1.10.0-cr0',
-          },
-      ],
-      'condition': 'checkout_android',
-      'dep_type': 'cipd',
+  'src/buildtools/linux64': {
+    'packages': [
+      {
+        'package': 'gn/gn/linux-amd64',
+        'version': 'git_revision:new-revision',
+      }
+    ],
+    'dep_type': 'cipd',
+    'condition': 'checkout_linux',
   },
 
   # Script expects to find these markers.