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

Unified Diff: net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc

Issue 2416483002: Use std::string instead of mojo::String in //net. (Closed)
Patch Set: Created 4 years, 2 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/mojo_proxy_resolver_factory_impl.cc ('k') | net/proxy/mojo_proxy_resolver_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
diff --git a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
index 2d08aedf0ee722c8b8c49df119536a9163e565e6..31634106ee07c1b3594dabe6a1ae218af3e1d611 100644
--- a/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
+++ b/net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc
@@ -119,9 +119,9 @@ class MojoProxyResolverFactoryImplTest
void ReportResult(int32_t error) override { create_callback_.Run(error); }
- void Alert(const mojo::String& message) override {}
+ void Alert(const std::string& message) override {}
- void OnError(int32_t line_number, const mojo::String& message) override {}
+ void OnError(int32_t line_number, const std::string& message) override {}
void ResolveDns(std::unique_ptr<HostResolver::RequestInfo> request_info,
interfaces::HostResolverRequestClientPtr client) override {}
@@ -142,8 +142,7 @@ TEST_F(MojoProxyResolverFactoryImplTest, DisconnectProxyResolverClient) {
interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
this, mojo::GetProxy(&client_ptr));
- factory_->CreateResolver(mojo::String::From(kScriptData),
- mojo::GetProxy(&proxy_resolver),
+ factory_->CreateResolver(kScriptData, mojo::GetProxy(&proxy_resolver),
std::move(client_ptr));
proxy_resolver.set_connection_error_handler(
base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
@@ -170,8 +169,7 @@ TEST_F(MojoProxyResolverFactoryImplTest, Error) {
interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
this, mojo::GetProxy(&client_ptr));
- factory_->CreateResolver(mojo::String::From(kScriptData),
- mojo::GetProxy(&proxy_resolver),
+ factory_->CreateResolver(kScriptData, mojo::GetProxy(&proxy_resolver),
std::move(client_ptr));
proxy_resolver.set_connection_error_handler(
base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
@@ -192,8 +190,7 @@ TEST_F(MojoProxyResolverFactoryImplTest,
interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
this, mojo::GetProxy(&client_ptr));
- factory_->CreateResolver(mojo::String::From(kScriptData),
- mojo::GetProxy(&proxy_resolver),
+ factory_->CreateResolver(kScriptData, mojo::GetProxy(&proxy_resolver),
std::move(client_ptr));
proxy_resolver.set_connection_error_handler(
base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
@@ -211,8 +208,7 @@ TEST_F(MojoProxyResolverFactoryImplTest,
interfaces::ProxyResolverFactoryRequestClientPtr client_ptr;
mojo::Binding<ProxyResolverFactoryRequestClient> client_binding(
this, mojo::GetProxy(&client_ptr));
- factory_->CreateResolver(mojo::String::From(kScriptData),
- mojo::GetProxy(&proxy_resolver),
+ factory_->CreateResolver(kScriptData, mojo::GetProxy(&proxy_resolver),
std::move(client_ptr));
proxy_resolver.set_connection_error_handler(
base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
« no previous file with comments | « net/proxy/mojo_proxy_resolver_factory_impl.cc ('k') | net/proxy/mojo_proxy_resolver_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698