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

Unified Diff: net/proxy/proxy_resolver_factory_mojo_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/proxy_resolver_factory_mojo.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | 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 997f9b219dd61ddcf59b3542d896a9134c837eb9..ed9e0f5cc77951d4d6679bb4ceff7937a8c3fba0 100644
--- a/net/proxy/proxy_resolver_factory_mojo_unittest.cc
+++ b/net/proxy/proxy_resolver_factory_mojo_unittest.cc
@@ -18,7 +18,6 @@
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/values.h"
-#include "mojo/common/common_type_converters.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "net/base/load_states.h"
#include "net/base/net_errors.h"
@@ -348,7 +347,7 @@ class MockMojoProxyResolverFactory : public interfaces::ProxyResolverFactory {
private:
// Overridden from interfaces::ProxyResolver:
void CreateResolver(
- const mojo::String& pac_url,
+ const std::string& pac_url,
mojo::InterfaceRequest<interfaces::ProxyResolver> request,
interfaces::ProxyResolverFactoryRequestClientPtr client) override;
@@ -399,14 +398,14 @@ void MockMojoProxyResolverFactory::ClearBlockedClients() {
}
void MockMojoProxyResolverFactory::CreateResolver(
- const mojo::String& pac_script,
+ const std::string& pac_script,
mojo::InterfaceRequest<interfaces::ProxyResolver> request,
interfaces::ProxyResolverFactoryRequestClientPtr client) {
ASSERT_FALSE(create_resolver_actions_.empty());
CreateProxyResolverAction action = create_resolver_actions_.front();
create_resolver_actions_.pop();
- EXPECT_EQ(action.expected_pac_script, pac_script.To<std::string>());
+ EXPECT_EQ(action.expected_pac_script, pac_script);
client->Alert(pac_script);
client->OnError(12345, pac_script);
switch (action.action) {
@@ -535,7 +534,7 @@ class ProxyResolverFactoryMojoTest : public testing::Test,
}
std::unique_ptr<base::ScopedClosureRunner> CreateResolver(
- const mojo::String& pac_script,
+ const std::string& pac_script,
mojo::InterfaceRequest<interfaces::ProxyResolver> req,
interfaces::ProxyResolverFactoryRequestClientPtr client) override {
factory_ptr_->CreateResolver(pac_script, std::move(req), std::move(client));
« no previous file with comments | « net/proxy/proxy_resolver_factory_mojo.cc ('k') | net/proxy/proxy_service_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698