Update references to tools/telemetry in .gn, .gyp & .isolate files

Now that tools/telemetry is moved to catapult/ repo
(https://github.com/catapult-project/catapult/commit/40afc53353daf28b955397c8e27d6f1de7bb10b6), we will soon remove tools/telemetry/.

This patch update the reference to telemetry/ in .gn, .gyp & .isolate files

BUG=478864
TEST=patch set 1 delete telemetry/telemetry.gyp, telemetry/BUILD.gn & telemetry/telemetry.isolate, CQ shows that all bots are green.

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

Cr-Commit-Position: refs/heads/master@{#371681}

14 files changed, 33 insertions, 33 deletions

diff --git a/BUILD.gn b/BUILD.gn
index e85e060..fac0464 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -190,6 +190,7 @@ group("both_gn_and_gyp") {
       "//third_party/WebKit/Source/platform:blink_platform_unittests",
       "//third_party/WebKit/Source/web:webkit_unit_tests",
       "//third_party/WebKit/Source/wtf:wtf_unittests",
+      "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
       "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
       "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
@@ -197,7 +198,6 @@ group("both_gn_and_gyp") {
       "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
       "//third_party/smhasher:pmurhash",
       "//tools/imagediff($host_toolchain)",
-      "//tools/telemetry:bitmaptools($host_toolchain)",
       "//ui/display:display_unittests",
       "//ui/events:events_unittests",
       "//ui/gl:gl_unittests",
@@ -863,7 +863,7 @@ group("chromium_builder_perf") {
       "//gpu:gpu_perftests",
       "//media:media_perftests",
       "//media/midi:midi_unittests",
-      "//tools/telemetry:bitmaptools",
+      "//third_party/catapult/telemetry:bitmaptools",
     ]
 
     if (!is_chromeos) {
diff --git a/build/all.gyp b/build/all.gyp
index 7791013..6f1aba9 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -82,7 +82,7 @@
             '../content/content_shell_and_tests.gyp:content_shell_apk',
             '<@(android_app_targets)',
             'android_builder_tests',
-            '../tools/telemetry/telemetry.gyp:*#host',
+            '../third_party/catapult/telemetry/telemetry.gyp:*#host',
             # TODO(nyquist) This should instead by a target for sync when all of
             # the sync-related code for Android has been upstreamed.
             # See http://crbug.com/159203
@@ -141,6 +141,7 @@
             '../ppapi/tools/ppapi_tools.gyp:*',
             '../skia/skia.gyp:*',
             '../sync/tools/sync_tools.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
             '../third_party/WebKit/public/all.gyp:*',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:*',
             '../third_party/codesighs/codesighs.gyp:*',
@@ -159,7 +160,6 @@
             '../third_party/qcms/qcms.gyp:*',
             '../tools/gn/gn.gyp:*',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
-            '../tools/telemetry/telemetry.gyp:*',
             '../v8/tools/gyp/v8.gyp:*',
             '<(libjpeg_gyp_path):*',
           ],
@@ -362,12 +362,12 @@
             '../mojo/mojo.gyp:mojo',
             '../ppapi/ppapi_internal.gyp:ppapi_unittests',
             '../remoting/remoting.gyp:remoting_unittests',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
             '../third_party/WebKit/public/all.gyp:all_blink',
             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
             '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
-            '../tools/telemetry/telemetry.gyp:*',
           ],
         }],
         ['OS!="ios" and OS!="android" and chromecast==0', {
@@ -581,7 +581,7 @@
             '../media/media.gyp:media_perftests',
             '../media/midi/midi.gyp:midi_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
           ],
           'conditions': [
             ['OS!="ios" and OS!="win"', {
@@ -620,7 +620,7 @@
             '../gpu/gpu.gyp:gl_tests',
             '../gpu/gpu.gyp:angle_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
           ],
           'conditions': [
             ['OS!="ios" and OS!="win"', {
@@ -657,7 +657,7 @@
             '../gpu/gpu.gyp:gl_tests',
             '../gpu/gpu.gyp:angle_unittests',
             '../gpu/gpu.gyp:gpu_unittests',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
           ],
           'conditions': [
             ['OS!="ios" and OS!="win"', {
@@ -953,7 +953,7 @@
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../ui/gl/gl_tests.gyp:gl_unittests',
@@ -993,7 +993,7 @@
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
             '../ui/gl/gl_tests.gyp:gl_unittests',
@@ -1100,7 +1100,7 @@
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_unittests',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
-            '../tools/telemetry/telemetry.gyp:*',
+            '../third_party/catapult/telemetry/telemetry.gyp:*',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/events/events_unittests.gyp:events_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
@@ -1288,7 +1288,7 @@
             '../sandbox/sandbox.gyp:chrome_sandbox',
             '../sandbox/sandbox.gyp:sandbox_linux_unittests',
             '../third_party/mesa/mesa.gyp:osmesa',
-            '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+            '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host',
             '../tools/perf/clear_system_cache/clear_system_cache.gyp:clear_system_cache',
           ],
           'conditions': [
diff --git a/build/android/android.isolate b/build/android/android.isolate
index 4db7646..bada53c 100644
--- a/build/android/android.isolate
+++ b/build/android/android.isolate
@@ -11,7 +11,6 @@
       '../../third_party/catapult/',
       '../../third_party/requests/',
       '../../tools/swarming_client/',
-      '../../tools/telemetry/telemetry/',
       '<(PRODUCT_DIR)/icudtl.dat',
       '<(PRODUCT_DIR)/lib.java/chromium_commands.dex.jar',
       '<(PRODUCT_DIR)/host_forwarder',
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 99b543d..2af02ba 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -87,7 +87,7 @@
         '../third_party/leveldatabase/leveldatabase.gyp:env_chromium_unittests',
         '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_unittests',
         '../third_party/smhasher/smhasher.gyp:pmurhash',
-        '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+        '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host',
         '../ui/accessibility/accessibility.gyp:accessibility_unittests',
         '../ui/base/ui_base_tests.gyp:ui_base_unittests',
         '../ui/display/display.gyp:display_unittests',
@@ -233,7 +233,7 @@
             '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk',
             '../tools/android/android_tools.gyp:memconsumer',
             '../tools/imagediff/image_diff.gyp:image_diff#host',
-            '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+            '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host',
             '../ui/android/ui_android.gyp:ui_android_unittests_apk',
             '../ui/android/ui_android.gyp:ui_junit_tests',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
diff --git a/chrome/ct_top1k.isolate b/chrome/ct_top1k.isolate
index 2e47b47..14be85f 100644
--- a/chrome/ct_top1k.isolate
+++ b/chrome/ct_top1k.isolate
@@ -6,7 +6,6 @@
   'includes': [
     # TODO(rmistry): Try out the below once things are running on the
     #                FYI waterfall.
-    # '../tools/telemetry/telemetry.isolate',
     # '../tools/perf/perf.isolate',
     '../tools/perf/chrome_telemetry_build/telemetry_binary_manager.isolate',
   ],
@@ -18,7 +17,6 @@
           '../build/android/devil/',
           '../testing/variations/',
           '../third_party/catapult/',
-          '../tools/telemetry/',
           '../tools/perf/',
           '../tools/variations/',
           '../testing/test_env.py',
diff --git a/chrome/telemetry_gpu_unittests.isolate b/chrome/telemetry_gpu_unittests.isolate
index f7038da..44252a6 100644
--- a/chrome/telemetry_gpu_unittests.isolate
+++ b/chrome/telemetry_gpu_unittests.isolate
@@ -2,9 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
-  'includes': [
-    '../tools/telemetry/telemetry.isolate',
-  ],
   'conditions': [
     ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
diff --git a/chrome/telemetry_perf_unittests_android.isolate b/chrome/telemetry_perf_unittests_android.isolate
index d56affb..6975895 100644
--- a/chrome/telemetry_perf_unittests_android.isolate
+++ b/chrome/telemetry_perf_unittests_android.isolate
@@ -4,7 +4,7 @@
 {
   'includes': [
     '../build/android/android.isolate',
-    '../chrome/telemetry.isolate',
+    '../third_party/catapult/telemetry/telemetry.isolate',
   ],
   'variables': {
     'command': [
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 034f25c..60fbe7d 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -745,7 +745,7 @@ if (!is_android) {
 
   group("telemetry_gpu_unittests") {
     deps = [
-      "//tools/telemetry:telemetry_test_support",
+      "//third_party/catapult/telemetry:telemetry_test_support",
     ]
     data = [
       # TODO(kbr): refactor the telemetry dependencies more cleanly.
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 23b6e37..3b9500d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1060,7 +1060,7 @@
           'target_name': 'telemetry_base',
           'type': 'none',
           'dependencies': [
-            '../tools/telemetry/telemetry.gyp:bitmaptools#host',
+            '../third_party/catapult/telemetry/telemetry.gyp:bitmaptools#host',
           ],
         },
       ],
diff --git a/tools/android/BUILD.gn b/tools/android/BUILD.gn
index 012dc35..4e074bd 100644
--- a/tools/android/BUILD.gn
+++ b/tools/android/BUILD.gn
@@ -8,13 +8,13 @@
 # GYP: //tools/android/android_tools.gyp:android_tools
 group("android_tools") {
   deps = [
+    "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
     "//tools/android/adb_reboot",
     "//tools/android/file_poller",
     "//tools/android/forwarder2",
     "//tools/android/md5sum",
     "//tools/android/memtrack_helper:memtrack_helper",
     "//tools/android/purge_ashmem",
-    "//tools/telemetry:bitmaptools($host_toolchain)",
   ]
 }
 
diff --git a/tools/android/android_tools.gyp b/tools/android/android_tools.gyp
index b963b3f..065c804 100644
--- a/tools/android/android_tools.gyp
+++ b/tools/android/android_tools.gyp
@@ -17,7 +17,7 @@
         'md5sum/md5sum.gyp:md5sum',
         'memtrack_helper/memtrack_helper.gyp:memtrack_helper',
         'purge_ashmem/purge_ashmem.gyp:purge_ashmem',
-        '../../tools/telemetry/telemetry.gyp:*#host',
+        '../../third_party/catapult/telemetry/telemetry.gyp:*#host',
       ],
     },
     {
diff --git a/tools/perf/chrome_telemetry_build/BUILD.gn b/tools/perf/chrome_telemetry_build/BUILD.gn
index 6a1b748..4e00893 100644
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -5,19 +5,16 @@
 import("//build/config/compiler/compiler.gni")
 
 group("telemetry_chrome_test") {
-  deps = [
-    "//tools/telemetry:telemetry_test_support",
-  ]
-
   data_deps = [
     # TODO(kbr): this used to be "//chrome". Had to change this to
     # chrome_initial temporarily to work around crbug.com/536192.
     "//chrome:chrome_initial",
-    "//tools/telemetry:bitmaptools",
+    "//third_party/catapult/telemetry:bitmaptools",
   ]
 
   data = [
     "//tools/perf/chrome_telemetry_build/",
+    "//third_party/catapult/",
   ]
 
   if (is_win) {
diff --git a/tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate b/tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate
index f87dcd4..86b8e24 100644
--- a/tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate
+++ b/tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate
@@ -7,7 +7,16 @@
   'includes': [
     '../../../chrome/breakpad.isolate',
     '../../../chrome/chrome.isolate',
-    '../../telemetry/telemetry.isolate',
     'telemetry_binary_manager.isolate',
   ],
+  'conditions': [
+    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+      'variables': {
+        'files': [
+          '../../../third_party/catapult/',
+        ],
+      },
+    }],
+  ]
+
 }
diff --git a/tools/perf/core/telemetry_dependencies_unittest.py b/tools/perf/core/telemetry_dependencies_unittest.py
index 51d0c02..cd30e05 100644
--- a/tools/perf/core/telemetry_dependencies_unittest.py
+++ b/tools/perf/core/telemetry_dependencies_unittest.py
@@ -14,8 +14,8 @@ from core import find_dependencies
 from core import path_util
 
 _TELEMETRY_DEPS = [
-    'third_party/catapult/',
-    'tools/telemetry/']
+  'third_party/catapult/',
+]
 
 
 def _GetCurrentTelemetryDependencies():