Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(568)

Unified Diff: net/http/http_vary_data_unittest.cc

Issue 15829004: Update net/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: license twerk Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_transaction_unittest.cc ('k') | net/http/mock_http_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_vary_data_unittest.cc
diff --git a/net/http/http_vary_data_unittest.cc b/net/http/http_vary_data_unittest.cc
index 93ee4f45aee045befb721cf81a070c66c9f08429..cffa2d299ac85b7dd9a39837baeddda2c73a8b14 100644
--- a/net/http/http_vary_data_unittest.cc
+++ b/net/http/http_vary_data_unittest.cc
@@ -45,7 +45,7 @@ TEST(HttpVaryDataTest, IsInvalid) {
net::HttpVaryData v;
EXPECT_FALSE(v.is_valid());
- EXPECT_FALSE(v.Init(t.request, *t.response));
+ EXPECT_FALSE(v.Init(t.request, *t.response.get()));
EXPECT_FALSE(v.is_valid());
}
}
@@ -56,13 +56,13 @@ TEST(HttpVaryDataTest, MultipleInit) {
// Init to something valid.
TestTransaction t1;
t1.Init("Foo: 1\r\nbar: 23", "HTTP/1.1 200 OK\nVary: foo, bar\n\n");
- EXPECT_TRUE(v.Init(t1.request, *t1.response));
+ EXPECT_TRUE(v.Init(t1.request, *t1.response.get()));
EXPECT_TRUE(v.is_valid());
// Now overwrite by initializing to something invalid.
TestTransaction t2;
t2.Init("Foo: 1\r\nbar: 23", "HTTP/1.1 200 OK\nVary: *\n\n");
- EXPECT_FALSE(v.Init(t2.request, *t2.response));
+ EXPECT_FALSE(v.Init(t2.request, *t2.response.get()));
EXPECT_FALSE(v.is_valid());
}
@@ -74,9 +74,9 @@ TEST(HttpVaryDataTest, DoesVary) {
b.Init("Foo: 2", "HTTP/1.1 200 OK\nVary: foo\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_FALSE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_FALSE(v.MatchesRequest(b.request, *b.response.get()));
}
TEST(HttpVaryDataTest, DoesVary2) {
@@ -87,9 +87,9 @@ TEST(HttpVaryDataTest, DoesVary2) {
b.Init("Foo: 12\r\nbar: 3", "HTTP/1.1 200 OK\nVary: foo, bar\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_FALSE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_FALSE(v.MatchesRequest(b.request, *b.response.get()));
}
TEST(HttpVaryDataTest, DoesntVary) {
@@ -100,9 +100,9 @@ TEST(HttpVaryDataTest, DoesntVary) {
b.Init("Foo: 1", "HTTP/1.1 200 OK\nVary: foo\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_TRUE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_TRUE(v.MatchesRequest(b.request, *b.response.get()));
}
TEST(HttpVaryDataTest, DoesntVary2) {
@@ -113,9 +113,9 @@ TEST(HttpVaryDataTest, DoesntVary2) {
b.Init("Foo: 1\r\nbaR: 2", "HTTP/1.1 200 OK\nVary: foo\nVary: bar\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_TRUE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_TRUE(v.MatchesRequest(b.request, *b.response.get()));
}
TEST(HttpVaryDataTest, ImplicitCookieForRedirect) {
@@ -126,9 +126,9 @@ TEST(HttpVaryDataTest, ImplicitCookieForRedirect) {
b.Init("Cookie: 2", "HTTP/1.1 301 Moved\nLocation: x\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_FALSE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_FALSE(v.MatchesRequest(b.request, *b.response.get()));
}
TEST(HttpVaryDataTest, ImplicitCookieForRedirect2) {
@@ -141,7 +141,7 @@ TEST(HttpVaryDataTest, ImplicitCookieForRedirect2) {
b.Init("Cookie: 2", "HTTP/1.1 301 Moved\nLocation: x\nVary: cooKie\n\n");
net::HttpVaryData v;
- EXPECT_TRUE(v.Init(a.request, *a.response));
+ EXPECT_TRUE(v.Init(a.request, *a.response.get()));
- EXPECT_FALSE(v.MatchesRequest(b.request, *b.response));
+ EXPECT_FALSE(v.MatchesRequest(b.request, *b.response.get()));
}
« no previous file with comments | « net/http/http_transaction_unittest.cc ('k') | net/http/mock_http_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698