unchecked_malloc() for Skia on OSX.

chrome/browser/safe_browsing/protocol_manager_unittest.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 "base/logging.h"
-#include "base/stringprintf.h"
 #include "base/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "chrome/browser/safe_browsing/protocol_manager.h"
-#include "google_apis/google_api_keys.h"
-#include "net/base/escape.h"
 
 using base::Time;
 using base::TimeDelta;
 
 static const char kUrlPrefix[] = "https://prefix.com/foo";
 static const char kClient[] = "unittest";
 static const char kAppVer[] = "1.0";
 static const char kAdditionalQuery[] = "additional_query";
 
 class SafeBrowsingProtocolManagerTest : public testing::Test {
- protected:
-  std::string key_param_;
-
-  virtual void SetUp() {
-    std::string key = google_apis::GetAPIKey();
-    if (!key.empty()) {
-      key_param_ = base::StringPrintf(
-          "&key=%s",
-          net::EscapeQueryParamValue(key, true).c_str());
-    }
-  }
 };
 
 // Ensure that we respect section 5 of the SafeBrowsing protocol specification.
 TEST_F(SafeBrowsingProtocolManagerTest, TestBackOffTimes) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
   pm.next_update_interval_ = base::TimeDelta::FromSeconds(1800);
   ASSERT_TRUE(pm.back_off_fuzz_ >= 0.0 && pm.back_off_fuzz_ <= 1.0);
 
   base::TimeDelta next;
 
@@ skipping 112 matching lines @@
   // 7 errors.
   pm.HandleGetHashError(now);
   EXPECT_EQ(pm.gethash_error_count_, 7);
   EXPECT_TRUE(pm.next_gethash_time_== now + TimeDelta::FromMinutes(480));
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestGetHashUrl) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
   pm.version_ = kAppVer;
   EXPECT_EQ("https://prefix.com/foo/gethash?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_, pm.GetHashUrl().spec());
+            "pver=2.2", pm.GetHashUrl().spec());
 
   pm.set_additional_query(kAdditionalQuery);
   EXPECT_EQ("https://prefix.com/foo/gethash?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query",
+            "pver=2.2&additional_query",
             pm.GetHashUrl().spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestUpdateUrl) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
   pm.version_ = kAppVer;
 
   EXPECT_EQ("https://prefix.com/foo/downloads?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_, pm.UpdateUrl().spec());
+            "pver=2.2", pm.UpdateUrl().spec());
 
   pm.set_additional_query(kAdditionalQuery);
   EXPECT_EQ("https://prefix.com/foo/downloads?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query",
-            pm.UpdateUrl().spec());
+            "pver=2.2&additional_query", pm.UpdateUrl().spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestSafeBrowsingHitUrl) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
   pm.version_ = kAppVer;
 
   GURL malicious_url("http://malicious.url.com");
   GURL page_url("http://page.url.com");
   GURL referrer_url("http://referrer.url.com");
   EXPECT_EQ("https://prefix.com/foo/report?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ +
-            "&evts=malblhit&evtd=http%3A%2F%2Fmalicious.url.com%2F&"
+            "pver=2.2&evts=malblhit&evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=1",
             pm.SafeBrowsingHitUrl(
                 malicious_url, page_url, referrer_url,
                 true, SafeBrowsingService::URL_MALWARE).spec());
 
   pm.set_additional_query(kAdditionalQuery);
   EXPECT_EQ("https://prefix.com/foo/report?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query&evts=phishblhit&"
+            "pver=2.2&additional_query&evts=phishblhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0",
             pm.SafeBrowsingHitUrl(
                 malicious_url, page_url, referrer_url,
                 false, SafeBrowsingService::URL_PHISHING).spec());
 
   EXPECT_EQ("https://prefix.com/foo/report?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query&evts=binurlhit&"
+            "pver=2.2&additional_query&evts=binurlhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0",
             pm.SafeBrowsingHitUrl(
                 malicious_url, page_url, referrer_url,
                 false, SafeBrowsingService::BINARY_MALWARE_URL).spec());
 
   EXPECT_EQ("https://prefix.com/foo/report?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query&evts=binhashhit&"
+            "pver=2.2&additional_query&evts=binhashhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0",
             pm.SafeBrowsingHitUrl(
                 malicious_url, page_url, referrer_url,
                 false, SafeBrowsingService::BINARY_MALWARE_HASH).spec());
 
   EXPECT_EQ("https://prefix.com/foo/report?client=unittest&appver=1.0&"
-            "pver=2.2" + key_param_ + "&additional_query&evts=phishcsdhit&"
+            "pver=2.2&additional_query&evts=phishcsdhit&"
             "evtd=http%3A%2F%2Fmalicious.url.com%2F&"
             "evtr=http%3A%2F%2Fpage.url.com%2F&evhr=http%3A%2F%2Freferrer."
             "url.com%2F&evtb=0",
             pm.SafeBrowsingHitUrl(
                 malicious_url, page_url, referrer_url,
                 false, SafeBrowsingService::CLIENT_SIDE_PHISHING_URL).spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestMalwareDetailsUrl) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
 
   pm.version_ = kAppVer;
   pm.set_additional_query(kAdditionalQuery);  // AdditionalQuery is not used.
   EXPECT_EQ("https://prefix.com/foo/clientreport/malware?"
-            "client=unittest&appver=1.0&pver=1.0" + key_param_,
+            "client=unittest&appver=1.0&pver=1.0",
             pm.MalwareDetailsUrl().spec());
 }
 
 TEST_F(SafeBrowsingProtocolManagerTest, TestNextChunkUrl) {
   SafeBrowsingProtocolManager pm(NULL, kClient, NULL, kUrlPrefix, false);
   pm.version_ = kAppVer;
 
   std::string url_partial = "localhost:1234/foo/bar?foo";
   std::string url_http_full = "http://localhost:1234/foo/bar?foo";
   std::string url_https_full = "https://localhost:1234/foo/bar?foo";
@@ skipping 11 matching lines @@
   pm.set_additional_query(kAdditionalQuery);
   EXPECT_EQ("https://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_partial).spec());
   EXPECT_EQ("http://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_http_full).spec());
   EXPECT_EQ("https://localhost:1234/foo/bar?foo&additional_query",
             pm.NextChunkUrl(url_https_full).spec());
   EXPECT_EQ("https://localhost:1234/foo/bar?additional_query",
             pm.NextChunkUrl(url_https_no_query).spec());
 }