diff options
| author | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:34:50 +0000 |
|---|---|---|
| committer | mkwst@chromium.org <mkwst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 15:34:50 +0000 |
| commit | 4db72870c1929edfb10874c8388a130a797843e4 (patch) | |
| tree | 60e743632ed894d7b40273618dd5fe9809dac5af /content | |
| parent | 8534b6c46d32b4ee586744f55ed0a281b648e499 (diff) | |
| download | chromium_src-4db72870c1929edfb10874c8388a130a797843e4.zip chromium_src-4db72870c1929edfb10874c8388a130a797843e4.tar.gz chromium_src-4db72870c1929edfb10874c8388a130a797843e4.tar.bz2 | |
Prefer 'Content-Security-Policy' to 'X-WebKit-CSP'.
Support for the canonical CSP header landed in wkrev.com/133095. This CL
migrates the various places inside Chromium that use the prefixed header
over to the new hotness.
BUG=151857
TBR=aa@chromium.org,michaeln@chromium.org,sky@chromium.org,estade@chromium.org,kinuko@chromium.org,willchan@chromium.org,phajdan.jr@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11368048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/histogram_internals_request_job.cc | 4 | ||||
| -rw-r--r-- | content/browser/tcmalloc_internals_request_job.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/histogram_internals_request_job.cc b/content/browser/histogram_internals_request_job.cc index 08e2629..55ff5a9 100644 --- a/content/browser/histogram_internals_request_job.cc +++ b/content/browser/histogram_internals_request_job.cc @@ -46,8 +46,8 @@ void AboutHistogram(std::string* data, const std::string& path) { data->append("<!DOCTYPE html>\n<html>\n<head>\n"); data->append( - "<meta http-equiv=\"X-WebKit-CSP\" content=\"object-src 'none'; " - "script-src 'none' 'unsafe-eval'\">"); + "<meta http-equiv=\"Content-Security-Policy\" " + "content=\"object-src 'none'; script-src 'none' 'unsafe-eval'\">"); data->append("<title>"); data->append(net::EscapeForHTML(unescaped_title)); data->append("</title>\n"); diff --git a/content/browser/tcmalloc_internals_request_job.cc b/content/browser/tcmalloc_internals_request_job.cc index 2c4ef0d..87975b4 100644 --- a/content/browser/tcmalloc_internals_request_job.cc +++ b/content/browser/tcmalloc_internals_request_job.cc @@ -73,8 +73,8 @@ void RequestTcmallocStatsFromChildRenderProcesses() { void AboutTcmalloc(std::string* data) { data->append("<!DOCTYPE html>\n<html>\n<head>\n"); data->append( - "<meta http-equiv=\"X-WebKit-CSP\" content=\"object-src 'none'; " - "script-src 'none' 'unsafe-eval'\">"); + "<meta http-equiv=\"Content-Security-Policy\" " + "content=\"object-src 'none'; script-src 'none' 'unsafe-eval'\">"); data->append("<title>tcmalloc stats</title>"); data->append("</head><body>"); |