diff options
| author | alexmos <alexmos@chromium.org> | 2015-12-01 18:03:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-02 02:04:04 +0000 |
| commit | 9d656a8ca02c72b84df27110d54d025b2639cf84 (patch) | |
| tree | 6cfd2f72b7c206caf1f34ccc8564b313204d23ce /extensions/common | |
| parent | e18ce07ccb40aa6097764dc73ca0ebc3cf624c03 (diff) | |
| download | chromium_src-9d656a8ca02c72b84df27110d54d025b2639cf84.zip chromium_src-9d656a8ca02c72b84df27110d54d025b2639cf84.tar.gz chromium_src-9d656a8ca02c72b84df27110d54d025b2639cf84.tar.bz2 | |
Fix ExtensionApiTest.ContentScriptExtensionIframe for --isolate-extensions.
This requires making the test aware of kIsolateExtensions, so that it
can adjust its expectations accordingly. Since the schema in
extensions/common/api/test.json is also used in
extensions_browsertests (by web_view_apitest.cc), this also required
moving kIsolateExtensions to a location where those tests can
reference them, namely extensions/common/switches.cc.
BUG=532666
Review URL: https://codereview.chromium.org/1457163002
Cr-Commit-Position: refs/heads/master@{#362580}
Diffstat (limited to 'extensions/common')
| -rw-r--r-- | extensions/common/api/test.json | 4 | ||||
| -rw-r--r-- | extensions/common/switches.cc | 3 | ||||
| -rw-r--r-- | extensions/common/switches.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/extensions/common/api/test.json b/extensions/common/api/test.json index 55809fd..42a7a26 100644 --- a/extensions/common/api/test.json +++ b/extensions/common/api/test.json @@ -59,9 +59,9 @@ "minimum": 0, "maximum": 65535 }, - "sitePerProcess": { + "isolateExtensions": { "type": "boolean", - "description": "Whether or not the site-per-process flag is enabled." + "description": "Whether or not extensions are running in site isolation mode." } } } diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc index 7333434..9a14e75 100644 --- a/extensions/common/switches.cc +++ b/extensions/common/switches.cc @@ -69,6 +69,9 @@ const char kExtensionsOnChromeURLs[] = "extensions-on-chrome-urls"; // Whether to force developer mode extensions highlighting. const char kForceDevModeHighlighting[] = "force-dev-mode-highlighting"; +// Enables site isolation for all chrome-extension:// urls. +const char kIsolateExtensions[] = "isolate-extensions"; + // Path to a comma-separated list of apps to load at startup. The first app in // the list will be launched. const char kLoadApps[] = "load-apps"; diff --git a/extensions/common/switches.h b/extensions/common/switches.h index 5742efe..43517cf 100644 --- a/extensions/common/switches.h +++ b/extensions/common/switches.h @@ -27,6 +27,7 @@ extern const char kExtensionActionRedesign[]; extern const char kExtensionProcess[]; extern const char kExtensionsOnChromeURLs[]; extern const char kForceDevModeHighlighting[]; +extern const char kIsolateExtensions[]; extern const char kLoadApps[]; extern const char kScriptsRequireAction[]; extern const char kEnableScriptsRequireAction[]; |