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

Unified Diff: net/proxy/proxy_resolver_factory_mojo_unittest.cc

Issue 2083433002: Mojo: Remove url type converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/proxy/proxy_resolver_factory_mojo.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_resolver_factory_mojo_unittest.cc
diff --git a/net/proxy/proxy_resolver_factory_mojo_unittest.cc b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
index a3d610be2d7ad3d0c87f906935faa4eb8664b733..364462a8330caa187edca2154fe38e948adea731 100644
--- a/net/proxy/proxy_resolver_factory_mojo_unittest.cc
+++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
@@ -192,7 +192,7 @@ class MockMojoProxyResolver : public interfaces::ProxyResolver {
private:
// Overridden from interfaces::ProxyResolver:
void GetProxyForUrl(
- const mojo::String& url,
+ const GURL& url,
interfaces::ProxyResolverRequestClientPtr client) override;
void WakeWaiter();
@@ -244,15 +244,15 @@ void MockMojoProxyResolver::AddConnection(
}
void MockMojoProxyResolver::GetProxyForUrl(
- const mojo::String& url,
+ const GURL& url,
interfaces::ProxyResolverRequestClientPtr client) {
ASSERT_FALSE(get_proxy_actions_.empty());
GetProxyForUrlAction action = get_proxy_actions_.front();
get_proxy_actions_.pop();
- EXPECT_EQ(action.expected_url.spec(), url.To<std::string>());
- client->Alert(url);
- client->OnError(12345, url);
+ EXPECT_EQ(action.expected_url, url);
+ client->Alert(url.spec());
+ client->OnError(12345, url.spec());
switch (action.action) {
case GetProxyForUrlAction::COMPLETE: {
client->ReportResult(action.error, std::move(action.proxy_servers));
@@ -273,7 +273,7 @@ void MockMojoProxyResolver::GetProxyForUrl(
case GetProxyForUrlAction::MAKE_DNS_REQUEST: {
interfaces::HostResolverRequestInfoPtr request(
interfaces::HostResolverRequestInfo::New());
- request->host = url;
+ request->host = url.spec();
request->port = 12345;
interfaces::HostResolverRequestClientPtr dns_client;
mojo::GetProxy(&dns_client);
« no previous file with comments | « net/proxy/proxy_resolver_factory_mojo.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698