diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 22:08:05 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-21 22:08:05 +0000 |
| commit | 1171442b83b8b2ca4a5c428ccb710ccffd3494dd (patch) | |
| tree | 064af4366dff33a34031fdc56c2dd59f71d86f44 /chrome/renderer/translate | |
| parent | 4aa884d3c4b23d8fad578cb051006844e4ca4e17 (diff) | |
| download | chromium_src-1171442b83b8b2ca4a5c428ccb710ccffd3494dd.zip chromium_src-1171442b83b8b2ca4a5c428ccb710ccffd3494dd.tar.gz chromium_src-1171442b83b8b2ca4a5c428ccb710ccffd3494dd.tar.bz2 | |
Revert 218799 "Translate: add an origin check to the loader"
Spectulative revert to make chromium.webkit bots green.
TranslationInfoBarTest.Instantiate has been crashing in the following bots:
http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/19779
> Translate: add an origin check to the loader
>
> This check isn't essential because third party scripts can not affect the
> isolated world.
>
> Also, add some tests for recent changes around script parameters
> for API key, secure connections, callbacks, and so on.
>
> BUG=268785
>
> Review URL: https://chromiumcodereview.appspot.com/22865005
TBR=toyoshim@chromium.org
Review URL: https://codereview.chromium.org/22875033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/translate')
| -rw-r--r-- | chrome/renderer/translate/translate_helper.cc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/renderer/translate/translate_helper.cc b/chrome/renderer/translate/translate_helper.cc index ee73f02..d4c5415 100644 --- a/chrome/renderer/translate/translate_helper.cc +++ b/chrome/renderer/translate/translate_helper.cc @@ -5,6 +5,7 @@ #include "chrome/renderer/translate/translate_helper.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" @@ -12,10 +13,10 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" +#include "chrome/common/chrome_switches.h" #include "chrome/common/render_messages.h" #include "chrome/common/translate/language_detection_util.h" #include "chrome/common/translate/translate_common_metrics.h" -#include "chrome/common/translate/translate_util.h" #include "chrome/renderer/extensions/extension_groups.h" #include "chrome/renderer/isolated_world_ids.h" #include "content/public/renderer/render_view.h" @@ -61,6 +62,9 @@ const char kAutoDetectionLanguage[] = "auto"; // Isolated world sets following content-security-policy. const char kContentSecurityPolicy[] = "script-src 'self' 'unsafe-eval'"; +// Isolated world sets following security-origin by default. +const char kSecurityOrigin[] = "https://translate.googleapis.com"; + } // namespace //////////////////////////////////////////////////////////////////////////////// @@ -353,10 +357,15 @@ void TranslateHelper::OnTranslatePage(int page_id, chrome::ISOLATED_WORLD_ID_TRANSLATE, WebString::fromUTF8(kContentSecurityPolicy)); - GURL security_origin = TranslateUtil::GetTranslateSecurityOrigin(); + std::string security_origin(kSecurityOrigin); + CommandLine* command_line = CommandLine::ForCurrentProcess(); + if (command_line->HasSwitch(switches::kTranslateSecurityOrigin)) { + security_origin = + command_line->GetSwitchValueASCII(switches::kTranslateSecurityOrigin); + } frame->setIsolatedWorldSecurityOrigin( chrome::ISOLATED_WORLD_ID_TRANSLATE, - WebSecurityOrigin::create(security_origin)); + WebSecurityOrigin::create(GURL(security_origin))); } if (!IsTranslateLibAvailable()) { |