unchecked_malloc() for Skia on OSX.

chrome/browser/safe_browsing/protocol_manager.cc

 // Copyright (c) 2012 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/safe_browsing/protocol_manager.h"
 
 #ifndef NDEBUG
 #include "base/base64.h"
 #endif
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/timer.h"
 #include "chrome/browser/safe_browsing/protocol_parser.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/env_vars.h"
 #include "content/public/browser/browser_thread.h"
-#include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 using base::Time;
 using base::TimeDelta;
 using content::BrowserThread;
 
@@ skipping 611 matching lines @@
 
 std::string SafeBrowsingProtocolManager::ComposeUrl(
     const std::string& prefix, const std::string& method,
     const std::string& client_name, const std::string& version,
     const std::string& additional_query) {
   DCHECK(!prefix.empty() && !method.empty() &&
          !client_name.empty() && !version.empty());
   std::string url = base::StringPrintf("%s/%s?client=%s&appver=%s&pver=2.2",
                                        prefix.c_str(), method.c_str(),
                                        client_name.c_str(), version.c_str());
-  std::string api_key = google_apis::GetAPIKey();
-  if (!api_key.empty()) {
-    base::StringAppendF(&url, "&key=%s",
-                        net::EscapeQueryParamValue(api_key, true).c_str());
-  }
   if (!additional_query.empty()) {
     DCHECK(url.find("?") != std::string::npos);
     url.append("&");
     url.append(additional_query);
   }
   return url;
 }
 
 GURL SafeBrowsingProtocolManager::UpdateUrl() const {
   return GURL(ComposeUrl(url_prefix_, "downloads", client_name_, version_,
@@ skipping 43 matching lines @@
       net::EscapeQueryParamValue(referrer_url.spec(), true).c_str(),
       is_subresource));
 }
 
 GURL SafeBrowsingProtocolManager::MalwareDetailsUrl() const {
   std::string url = base::StringPrintf(
           "%s/clientreport/malware?client=%s&appver=%s&pver=1.0",
           url_prefix_.c_str(),
           client_name_.c_str(),
           version_.c_str());
-  std::string api_key = google_apis::GetAPIKey();
-  if (!api_key.empty()) {
-    base::StringAppendF(&url, "&key=%s",
-                        net::EscapeQueryParamValue(api_key, true).c_str());
-  }
   return GURL(url);
 }
 
 GURL SafeBrowsingProtocolManager::NextChunkUrl(const std::string& url) const {
   std::string next_url;
   if (!StartsWithASCII(url, "http://", false) &&
       !StartsWithASCII(url, "https://", false)) {
     // Use https if we updated via https, otherwise http (useful for testing).
     if (StartsWithASCII(url_prefix_, "https://", false))
       next_url.append("https://");
     else
       next_url.append("http://");
     next_url.append(url);
   } else {
     next_url = url;
   }
   if (!additional_query_.empty()) {
     if (next_url.find("?") != std::string::npos) {
       next_url.append("&");
     } else {
       next_url.append("?");
     }
     next_url.append(additional_query_);
   }
   return GURL(next_url);
 }