summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 00:34:04 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-04 00:34:04 +0000
commit34f40946dab92acf2c0b25c067e14bc438c1e676 (patch)
tree236343b5e718f6f88a88946c1b8a2c4697b790f8 /net/http
parent74e3af7013e7fb3ae9a9cbd98a7fcaf8469b1b0d (diff)
downloadchromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.zip
chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.gz
chromium_src-34f40946dab92acf2c0b25c067e14bc438c1e676.tar.bz2
clang/mac: Fix almost all problems when building all.xcodeproj.
BUG=None TEST=None TBR=hans git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61344 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_network_transaction_unittest.cc2
-rw-r--r--net/http/mock_gssapi_library_posix.cc29
-rw-r--r--net/http/url_security_manager_unittest.cc2
3 files changed, 2 insertions, 31 deletions
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index ad41eac..02d4a5f 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -3814,7 +3814,7 @@ TEST_F(HttpNetworkTransactionTest, ResetStateForRestart) {
EXPECT_EQ(0U, trans->request_headers_.size());
EXPECT_TRUE(response->auth_challenge.get() == NULL);
EXPECT_TRUE(response->headers.get() == NULL);
- EXPECT_EQ(false, response->was_cached);
+ EXPECT_FALSE(response->was_cached);
EXPECT_EQ(0, response->ssl_info.cert_status);
EXPECT_FALSE(response->vary_data.is_valid());
}
diff --git a/net/http/mock_gssapi_library_posix.cc b/net/http/mock_gssapi_library_posix.cc
index d0a46b1..ec69964 100644
--- a/net/http/mock_gssapi_library_posix.cc
+++ b/net/http/mock_gssapi_library_posix.cc
@@ -52,21 +52,6 @@ void CopyOid(gss_OID dest, const gss_OID_desc* src) {
SetOid(dest, src->elements, src->length);
}
-std::string OidToString(const gss_OID src) {
- std::string dest;
- if (!src)
- return dest;
- const char* string = reinterpret_cast<char*>(src->elements);
- dest.assign(string, src->length);
- return dest;
-}
-
-void OidFromString(const std::string& src, gss_OID dest) {
- if (!dest)
- return;
- SetOid(dest, src.c_str(), src.length());
-}
-
// gss_buffer_t helpers.
void ClearBuffer(gss_buffer_t dest) {
if (!dest)
@@ -132,20 +117,6 @@ void SetName(gss_name_t dest, const void* src, size_t length) {
name->name.assign(reinterpret_cast<const char*>(src), length);
}
-void CopyName(gss_name_t dest, const gss_name_t src) {
- if (!dest)
- return;
- ClearName(dest);
- if (!src)
- return;
- test::GssNameMockImpl* name_dst =
- reinterpret_cast<test::GssNameMockImpl*>(dest);
- test::GssNameMockImpl* name_src =
- reinterpret_cast<test::GssNameMockImpl*>(dest);
- name_dst->name = name_src->name;
- CopyOid(&name_dst->name_type, &name_src->name_type);
-}
-
std::string NameToString(const gss_name_t& src) {
std::string dest;
if (!src)
diff --git a/net/http/url_security_manager_unittest.cc b/net/http/url_security_manager_unittest.cc
index 45d93c9..d1e7623 100644
--- a/net/http/url_security_manager_unittest.cc
+++ b/net/http/url_security_manager_unittest.cc
@@ -88,7 +88,7 @@ TEST(URLSecurityManager, CanDelegate_NoWhitelist) {
for (size_t i = 0; i < arraysize(kTestDataList); ++i) {
GURL gurl(kTestDataList[i].url);
bool can_delegate = url_security_manager->CanDelegate(gurl);
- EXPECT_EQ(false, can_delegate);
+ EXPECT_FALSE(can_delegate);
}
}