Translate: cleanup on how to pass api key to the script

Now that translate.js runs in an isolated world, it is safe to expose
API key as an isolated world global variable.
Of course, reusing this key outside Chrome is not permitted if it's possible:)

BUG=none
TEST=browser_tests --gtest_filter='Translate*.*'

Review URL: https://chromiumcodereview.appspot.com/22645015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217777 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/translate.js

@@ -9,7 +9,11 @@
 
 var cr = {};
 
-cr.googleTranslate = (function(key) {
+/**
+ * An object to provide functions to interact with the Translate library.
+ * @type {object}
+ */
+cr.googleTranslate = (function() {
   /**
    * The Translate Element library's instance.
    * @type {object}
@@ -259,11 +263,14 @@ cr.googleTranslate = (function(key) {
       loadedTime = performance.now();
       try {
         lib = google.translate.TranslateService({
-          'key': key,
+          // translateApiKey is predefined by translate_script.cc.
+          'key': translateApiKey,
           'useSecureConnection': true
         });
+        translateApiKey = undefined;
       } catch (err) {
         error = true;
+        translateApiKey = undefined;
         return;
       }
       // The TranslateService is not available immediately as it needs to start
@@ -271,4 +278,4 @@ cr.googleTranslate = (function(key) {
       checkLibReady();
     }
   };
-})/* Calling code '(|key|);' will be appended by TranslateHelper in C++ here. */
+})();

chrome/browser/translate/translate_script.cc

@@ -8,7 +8,9 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
 #include "chrome/browser/translate/translate_url_fetcher.h"
 #include "chrome/browser/translate/translate_url_util.h"
 #include "chrome/common/chrome_switches.h"
@@ -96,15 +98,13 @@ void TranslateScript::OnScriptFetchComplete(
   scoped_ptr<const TranslateURLFetcher> delete_ptr(fetcher_.release());
 
   if (success) {
+    DCHECK(data_.empty());
+    data_ = base::StringPrintf("var translateApiKey = '%s';\n",
+                               google_apis::GetAPIKey().c_str());
     base::StringPiece str = ResourceBundle::GetSharedInstance().
         GetRawDataResource(IDR_TRANSLATE_JS);
-    DCHECK(data_.empty());
-    str.CopyToString(&data_);
-    std::string argument = "('";
-    std::string api_key = google_apis::GetAPIKey();
-    argument += net::EscapeQueryParamValue(api_key, true);
-    argument += "');\n";
-    data_ += argument + data;
+    str.AppendToString(&data_);
+    data_ += data;
 
     // We'll expire the cached script after some time, to make sure long
     // running browsers still get fixes that might get pushed with newer