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

chrome/browser/translate/translate_script.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_script.h"
 
 #include "base/bind.h"
 #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"
 #include "google_apis/google_api_keys.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
 #include "net/base/url_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
@@ skipping 67 matching lines @@
 }
 
 
 void TranslateScript::OnScriptFetchComplete(
     int id, bool success, const std::string& data) {
   DCHECK_EQ(kFetcherId, id);
 
   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
     // scripts.
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&TranslateScript::Clear,
                    weak_method_factory_.GetWeakPtr()),
         expiration_delay_);
   }
 
   callback_.Run(success, data);
 }