Commit 6a8103a0 authored by benwells@chromium.org's avatar benwells@chromium.org

Update hotword private tests to not need auto whitelisting.

Component apps are currently auto whitelisted for all whitelisted APIs.
To allow this to be removed the hotword private tests are being updated
to manually whitelist the test extensions used.

See https://codereview.chromium.org/447673002/ for more context.

BUG=370375

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

Cr-Commit-Position: refs/heads/master@{#290200}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290200 0039d316-1c4b-4281-b951-d872f2087c98
parent 15f2de6e
......@@ -14,9 +14,12 @@
#include "chrome/browser/search/hotword_service_factory.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "extensions/common/switches.h"
namespace {
const char kHotwordTestExtensionId[] = "cpfhkdbjfdgdebcjlifoldbijinjfifp";
class MockHotwordService : public HotwordService {
public:
explicit MockHotwordService(Profile* profile)
......@@ -77,6 +80,15 @@ class HotwordPrivateApiTest : public ExtensionApiTest {
HotwordPrivateApiTest() {}
virtual ~HotwordPrivateApiTest() {}
virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
ExtensionApiTest::SetUpCommandLine(command_line);
// Whitelist the test extensions (which all share a common ID) to use
// private APIs.
command_line->AppendSwitchASCII(
extensions::switches::kWhitelistedExtensionID, kHotwordTestExtensionId);
}
virtual void SetUpOnMainThread() OVERRIDE {
ExtensionApiTest::SetUpOnMainThread();
......
{
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrL0ETveetCp+rKmuTgS7k7QWgBoWpLradbfRuqdLWeCkoTSaTkHdtO9SZbEm69mwOfWf8oUXE35sezWERBZYAX8Gdyn9s3BSTxHo3A4eEtYbRxjJJyphlM7Molf9/lrKhh5psyZaZwMLdTyzb2wlHPO+Zemzaj4McNbI6a4GNIQIDAQAB",
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
"manifest_version": 2,
......
{
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
......
{
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
......
{
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDrL0ETveetCp+rKmuTgS7k7QWgBoWpLradbfRuqdLWeCkoTSaTkHdtO9SZbEm69mwOfWf8oUXE35sezWERBZYAX8Gdyn9s3BSTxHo3A4eEtYbRxjJJyphlM7Molf9/lrKhh5psyZaZwMLdTyzb2wlHPO+Zemzaj4McNbI6a4GNIQIDAQAB",
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
"manifest_version": 2,
......
{
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
......
{
"key" : "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUPrZoII3A4g9EIM+/jixinHPFAZFZmJ0BVIqwGgfYJs4HUT8ODNFMHDoyTJIimf6W3118TiAiDag3VlRPCfgwP7y4nA1JIwLraMX53Hbcdexw1uNhNvA9RBnpKziGRp04gfcvMpC7FxGyktx5dIZNkD7aorCNGVG/yCPBRx29pQIDAQAB",
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
"manifest_version": 2,
......
{
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
......
{
"key" : "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUPrZoII3A4g9EIM+/jixinHPFAZFZmJ0BVIqwGgfYJs4HUT8ODNFMHDoyTJIimf6W3118TiAiDag3VlRPCfgwP7y4nA1JIwLraMX53Hbcdexw1uNhNvA9RBnpKziGRp04gfcvMpC7FxGyktx5dIZNkD7aorCNGVG/yCPBRx29pQIDAQAB",
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
"manifest_version": 2,
......
{
// chrome-extension://cpfhkdbjfdgdebcjlifoldbijinjfifp/
"key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXAxIB5iu+XGtMYYJgSwMrqO+zNa3FlWeMJLOV+U1T2VL6wDU3WD9YNlioI6a6wG49AFquEbRxQwwxlvAZC1c95LBvRlnQAkEVum0KbrJ8WHTxxDEPOfITE0J1AP5j8V0WQ9jbYvUxgefIPhDPXHpdPRAxDotygTrPa33x1075wIDAQAB",
"name": "Hotword Private Test Extension",
"version": "0.1",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment