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

Unified Diff: net/url_request/url_request_context_builder_unittest.cc

Issue 1151843002: DO NOT LAND Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More. Created 5 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
Index: net/url_request/url_request_context_builder_unittest.cc
diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc
index ecafea3b2108f84c29777a3a93a1ce37a5604337..01004dad01bd0c2836603708ffa75707cd3a7f43 100644
--- a/net/url_request/url_request_context_builder_unittest.cc
+++ b/net/url_request/url_request_context_builder_unittest.cc
@@ -14,6 +14,7 @@
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
+#include "url/origin.h"
#if defined(OS_LINUX) || defined(OS_ANDROID)
#include "net/proxy/proxy_config.h"
@@ -32,7 +33,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
HttpAuth::Target target,
- const GURL& origin,
+ const url::Origin& origin,
CreateReason reason,
int nonce_count,
const BoundNetLog& net_log,
@@ -92,7 +93,7 @@ TEST_F(URLRequestContextBuilderTest, UserAgent) {
}
TEST_F(URLRequestContextBuilderTest, ExtraHttpAuthHandlerFactory) {
- GURL gurl("www.google.com");
+ url::Origin origin("www.google.com");
const int kBasicReturnCode = OK;
MockHttpAuthHandlerFactory* mock_factory_basic =
new MockHttpAuthHandlerFactory(kBasicReturnCode);
@@ -102,15 +103,13 @@ TEST_F(URLRequestContextBuilderTest, ExtraHttpAuthHandlerFactory) {
// Verify that a handler is returned for and added scheme.
EXPECT_EQ(kBasicReturnCode,
context->http_auth_handler_factory()->CreateAuthHandlerFromString(
- "ExtraScheme",
- HttpAuth::AUTH_SERVER,
- gurl,
- BoundNetLog(),
+ "ExtraScheme", HttpAuth::AUTH_SERVER, origin, BoundNetLog(),
&handler));
// Verify that a handler isn't returned for a bogus scheme.
- EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
- context->http_auth_handler_factory()->CreateAuthHandlerFromString(
- "Bogus", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+ EXPECT_EQ(
+ ERR_UNSUPPORTED_AUTH_SCHEME,
+ context->http_auth_handler_factory()->CreateAuthHandlerFromString(
+ "Bogus", HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &handler));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698