diff options
9 files changed, 159 insertions, 8 deletions
diff --git a/tools/telemetry/bootstrap_deps b/tools/telemetry/bootstrap_deps index 10aa1dc..a5cd526 100644 --- a/tools/telemetry/bootstrap_deps +++ b/tools/telemetry/bootstrap_deps @@ -10,7 +10,6 @@ deps = { "src/tools/telemetry": "", - "src/chrome/test/data/extensions/profiles": "", "src/third_party/android_tools/sdk/platform-tools": "", "src/third_party/chromite/ssh_keys": "", "src/third_party/webpagereplay": "", diff --git a/tools/telemetry/telemetry/TELEMETRY_DEPS b/tools/telemetry/telemetry/TELEMETRY_DEPS index 27cbdbc..572dbfc 100644 --- a/tools/telemetry/telemetry/TELEMETRY_DEPS +++ b/tools/telemetry/telemetry/TELEMETRY_DEPS @@ -5,17 +5,15 @@ ], "directory_deps": [ "build/android/pylib/", - "chrome/test/data/extensions/", "third_party/android_testrunner/", "third_party/android_tools/sdk/platform-tools/", "third_party/trace-viewer/", "third_party/typ/", "third_party/pexpect/", "third_party/webpagereplay/", - "tools/telemetry/" + "tools/telemetry/", + "third_party/chromite/ssh_keys/" ], "file_deps": [ - "third_party/chromite/ssh_keys/testing_rsa", - "third_party/chromite/ssh_keys/testing_rsa.pub" ] } diff --git a/tools/telemetry/telemetry/core/profile_types.py b/tools/telemetry/telemetry/core/profile_types.py index 0a89238..73a0408 100644 --- a/tools/telemetry/telemetry/core/profile_types.py +++ b/tools/telemetry/telemetry/core/profile_types.py @@ -9,8 +9,8 @@ from telemetry.core import util BASE_PROFILE_TYPES = ['clean', 'default'] PROFILE_TYPE_MAPPING = { - 'typical_user': 'chrome/test/data/extensions/profiles/content_scripts1', - 'power_user': 'chrome/test/data/extensions/profiles/extension_webrequest', + 'typical_user': 'content_scripts1', + 'power_user': 'extension_webrequest', } def GetProfileTypes(): @@ -27,7 +27,7 @@ def GetProfileDir(profile_type): return None path = os.path.join( - util.GetChromiumSrcDir(), *PROFILE_TYPE_MAPPING[profile_type].split('/')) + util.GetTelemetryDir(), 'telemetry', 'internal', 'browser_profiles') assert os.path.exists(path) return path diff --git a/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json new file mode 100644 index 0000000..56fdb6c --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json @@ -0,0 +1,8 @@ +{ + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB", + "version": "1.0.0.0", + "name": "1 content script", + "content_scripts": [ + { "matches": ["file://*"], "js": ["script.js"] } + ] +} diff --git a/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script.js b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script.js new file mode 100644 index 0000000..01c9ed8 --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/script.js @@ -0,0 +1,8 @@ +// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Useless script just to test injection. +var x = 1; +var y = 2; +var z = 3; diff --git a/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Preferences b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Preferences new file mode 100644 index 0000000..142e7ff --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/content_scripts1/Default/Preferences @@ -0,0 +1,42 @@ +{ + "download": { + "directory_upgrade": true, + "extensions_to_open": "" + }, + "extensions": { + "autoupdate": { + "next_check": "12897640036342487" + }, + "settings": { + "behllobkkfkfnphdnhnkndlbkcpglgmj": { + "active_permissions": { + "scriptable_host": [ "file:///*" ] + }, + "granted_permissions": { + "scriptable_host": [ "file:///*" ] + }, + "location": 1, + "manifest": + { + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB", + "version": "1.0.0.0", + "name": "1 content script", + "content_scripts": [ + { "matches": ["file://*"], "js": ["script.js"] } + ] + }, + "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0", + "state": 1 + } + } + }, + "profile": { + "exited_cleanly": true, + "id": "not-signed-in", + "name": "", + "nickname": "" + }, + "session": { + "startup_urls": [ ] + } +} diff --git a/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/background.html b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/background.html new file mode 100644 index 0000000..d3f9988 --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/background.html @@ -0,0 +1,10 @@ +<script> +var onBefore = chrome.webRequest.onBeforeRequest; +onBefore.addListener(function(info) { + return {"cancel": false}; +}, {urls: ["http://*/*"]}, ['blocking']); +var onBefore = chrome.webRequest.onBeforeRequest; +onBefore.addListener(function(info) { + return {"cancel": false}; +}, {urls: ["file://*/*"]}, ['blocking']); +</script> diff --git a/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json new file mode 100644 index 0000000..835bc44 --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Extensions/behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0/manifest.json @@ -0,0 +1,9 @@ +{ + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB", + "version": "1.0.0.0", + "name": "Webrequest", + "permissions": ["experimental", "webRequest"], + "background": { + "page": "background.html" + } +} diff --git a/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Preferences b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Preferences new file mode 100644 index 0000000..e93588e --- /dev/null +++ b/tools/telemetry/telemetry/internal/browser_profiles/extension_webrequest/Default/Preferences @@ -0,0 +1,77 @@ +{ + "browser": { + "window_placement": { + "bottom": 1150, + "left": 10, + "maximized": false, + "right": 955, + "top": 10, + "work_area_bottom": 1160, + "work_area_left": 0, + "work_area_right": 1920, + "work_area_top": 0 + } + }, + "countryid_at_install": 21843, + "dns_prefetching": { + "host_referral_list": [ 2 ], + "startup_list": [ 1 ] + }, + "download": { + "directory_upgrade": true, + "extensions_to_open": "" + }, + "extensions": { + "autoupdate": { + "next_check": "12943417068538765" + }, + "chrome_url_overrides": { + "bookmarks": [ "chrome-extension://eemcgdkfndhakfknompkggombfjjjeno/main.html" ] + }, + "settings": { + "behllobkkfkfnphdnhnkndlbkcpglgmj": { + "granted_permissions": { + "api": [ "experimental" ], + "full": false + }, + "install_time": "12943416715915765", + "location": 1, + "manifest": { + "background": { + "page": "background.html" + }, + "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDuUZGKCDbff6IRaxa4Pue7PPkxwPaNhGT3JEqppEsNWFjM80imEdqMbf3lrWqEfaHgaNku7nlpwPO1mu3/4Hr+XdNa5MhfnOnuPee4hyTLwOs3Vzz81wpbdzUxZSi2OmqMyI5oTaBYICfNHLwcuc65N5dbt6WKGeKgTpp4v7j7zwIDAQAB", + "name": "Webrequest", + "permissions": [ "experimental", "webRequest" ], + "version": "1.0.0.0" + }, + "path": "behllobkkfkfnphdnhnkndlbkcpglgmj/1.0.0.0", + "state": 1 + } + } + }, + "google": { + "services": { + "username": "" + } + }, + "ntp": { + "pref_version": 3, + "promo_resource_cache_update": "1298943121.229765" + }, + "plugins": { + "enabled_internal_pdf3": true + }, + "profile": { + "content_settings": { + "pref_version": 1 + }, + "exited_cleanly": true, + "id": "not-signed-in", + "name": "", + "nickname": "" + }, + "tabs": { + "use_vertical_tabs": false + } +} |