From 6eb8e3d0ac1bb45c7f852c69c7c7a10e883dcc4e Mon Sep 17 00:00:00 2001
From: nednguyen <nednguyen@google.com>
Date: Tue, 18 Aug 2015 17:02:12 -0700
Subject: [PATCH] [Telemetry] Update telemetry's references to webpagereplay

BUG=472672

Dependent on https://codereview.chromium.org/1293183003/ landed first.

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

Cr-Commit-Position: refs/heads/master@{#344087}
---
 tools/telemetry/PRESUBMIT.py                                           | 2 +-
 tools/telemetry/bootstrap_deps                                         | 1 -
 tools/telemetry/telemetry/TELEMETRY_DEPS                               | 1 -
 tools/telemetry/telemetry/internal/browser/browser_options.py          | 2 +-
 .../telemetry/telemetry/internal/platform/android_platform_backend.py  | 3 +--
 tools/telemetry/telemetry/internal/util/webpagereplay.py               | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/telemetry/PRESUBMIT.py b/tools/telemetry/PRESUBMIT.py
index 535b44590844..5f9eaa7d9cdf 100644
--- a/tools/telemetry/PRESUBMIT.py
+++ b/tools/telemetry/PRESUBMIT.py
@@ -31,11 +31,11 @@ def _GetPathsToPrepend(input_api):
       telemetry_dir,
       input_api.os_path.join(telemetry_dir, 'third_party', 'mock'),
       input_api.os_path.join(telemetry_dir, 'third_party', 'typ'),
+      input_api.os_path.join(telemetry_dir, 'third_party', 'webpagereplay'),
       input_api.os_path.join(telemetry_dir, 'third_party', 'websocket-client'),
 
       input_api.os_path.join(chromium_src_dir, 'build', 'android'),
       input_api.os_path.join(chromium_src_dir, 'third_party', 'catapult'),
-      input_api.os_path.join(chromium_src_dir, 'third_party', 'webpagereplay'),
   ]
 
 
diff --git a/tools/telemetry/bootstrap_deps b/tools/telemetry/bootstrap_deps
index 4128642e3146..145defe2ecf2 100644
--- a/tools/telemetry/bootstrap_deps
+++ b/tools/telemetry/bootstrap_deps
@@ -10,6 +10,5 @@
 
 deps = {
     "src/tools/telemetry": "",
-    "src/third_party/webpagereplay": "",
     "src/third_party/catapult": "",
 }
diff --git a/tools/telemetry/telemetry/TELEMETRY_DEPS b/tools/telemetry/telemetry/TELEMETRY_DEPS
index ded3c8e2369e..29cc0c8a926f 100644
--- a/tools/telemetry/telemetry/TELEMETRY_DEPS
+++ b/tools/telemetry/telemetry/TELEMETRY_DEPS
@@ -7,7 +7,6 @@
     "build/android/pylib/",
     "third_party/catapult/",
     "third_party/ply/",
-    "third_party/webpagereplay/",
     "tools/telemetry/"
   ],
   "file_deps": [
diff --git a/tools/telemetry/telemetry/internal/browser/browser_options.py b/tools/telemetry/telemetry/internal/browser/browser_options.py
index 98a711b29bd3..87b5cbfc71b1 100644
--- a/tools/telemetry/telemetry/internal/browser/browser_options.py
+++ b/tools/telemetry/telemetry/internal/browser/browser_options.py
@@ -20,7 +20,7 @@ from telemetry.internal.platform.profiler import profiler_finder
 from telemetry.util import wpr_modes
 
 util.AddDirToPythonPath(
-    util.GetChromiumSrcDir(), 'third_party', 'webpagereplay')
+    util.GetTelemetryThirdPartyDir(), 'webpagereplay')
 import net_configs  # pylint: disable=F0401
 
 
diff --git a/tools/telemetry/telemetry/internal/platform/android_platform_backend.py b/tools/telemetry/telemetry/internal/platform/android_platform_backend.py
index 9049ea593b23..5496cbf1f343 100644
--- a/tools/telemetry/telemetry/internal/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/internal/platform/android_platform_backend.py
@@ -31,8 +31,7 @@ from telemetry.internal.util import exception_formatter
 from telemetry.internal.util import external_modules
 
 psutil = external_modules.ImportOptionalModule('psutil')
-util.AddDirToPythonPath(util.GetChromiumSrcDir(),
-                        'third_party', 'webpagereplay')
+util.AddDirToPythonPath(util.GetTelemetryThirdPartyDir(), 'webpagereplay')
 import adb_install_cert
 import certutils
 import platformsettings
diff --git a/tools/telemetry/telemetry/internal/util/webpagereplay.py b/tools/telemetry/telemetry/internal/util/webpagereplay.py
index 08303d2de742..16e9a9390247 100644
--- a/tools/telemetry/telemetry/internal/util/webpagereplay.py
+++ b/tools/telemetry/telemetry/internal/util/webpagereplay.py
@@ -17,7 +17,7 @@ from telemetry.core import exceptions
 from telemetry.core import util
 
 _REPLAY_DIR = os.path.join(
-    util.GetChromiumSrcDir(), 'third_party', 'webpagereplay')
+    util.GetTelemetryThirdPartyDir(), 'webpagereplay')
 
 
 class ReplayError(Exception):
-- 
2.11.4.GIT