Use std::string instead of mojo::String in //net.

net/proxy/mojo_proxy_resolver_factory_impl_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 101 matching lines @@
 
   void OnConnectionError() { waiter_.NotifyEvent(CONNECTION_ERROR); }
 
   void OnFakeProxyInstanceDestroyed() {
     instances_destroyed_++;
     waiter_.NotifyEvent(RESOLVER_DESTROYED);
   }
 
   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 {}
 
  protected:
   std::unique_ptr<TestProxyResolverFactory> mock_factory_owner_;
   TestProxyResolverFactory* mock_factory_;
   interfaces::ProxyResolverFactoryPtr factory_;
 
   int instances_destroyed_ = 0;
   CompletionCallback create_callback_;
 
   EventWaiter<Event> waiter_;
 };
 
 TEST_F(MojoProxyResolverFactoryImplTest, DisconnectProxyResolverClient) {
   interfaces::ProxyResolverPtr proxy_resolver;
   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,
                  base::Unretained(this)));
   waiter_.WaitForEvent(RESOLVER_CREATED);
   EXPECT_EQ(0, instances_destroyed_);
   ASSERT_EQ(1u, mock_factory_->requests_handled());
   TestCompletionCallback create_callback;
   create_callback_ = create_callback.callback();
   ASSERT_TRUE(mock_factory_->pending_request());
   mock_factory_->pending_request()->resolver->reset(
       new FakeProxyResolver(base::Bind(
           &MojoProxyResolverFactoryImplTest::OnFakeProxyInstanceDestroyed,
           base::Unretained(this))));
   mock_factory_->pending_request()->callback.Run(OK);
   EXPECT_THAT(create_callback.WaitForResult(), IsOk());
   proxy_resolver.reset();
   waiter_.WaitForEvent(RESOLVER_DESTROYED);
   EXPECT_EQ(1, instances_destroyed_);
 }
 
 TEST_F(MojoProxyResolverFactoryImplTest, Error) {
   interfaces::ProxyResolverPtr proxy_resolver;
   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,
                  base::Unretained(this)));
   waiter_.WaitForEvent(RESOLVER_CREATED);
   EXPECT_EQ(0, instances_destroyed_);
   ASSERT_EQ(1u, mock_factory_->requests_handled());
   TestCompletionCallback create_callback;
   create_callback_ = create_callback.callback();
   ASSERT_TRUE(mock_factory_->pending_request());
   mock_factory_->pending_request()->callback.Run(ERR_PAC_SCRIPT_FAILED);
   EXPECT_THAT(create_callback.WaitForResult(), IsError(ERR_PAC_SCRIPT_FAILED));
 }
 
 TEST_F(MojoProxyResolverFactoryImplTest,
        DisconnectClientDuringResolverCreation) {
   interfaces::ProxyResolverPtr proxy_resolver;
   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,
                  base::Unretained(this)));
   waiter_.WaitForEvent(RESOLVER_CREATED);
   EXPECT_EQ(0, instances_destroyed_);
   ASSERT_EQ(1u, mock_factory_->requests_handled());
   client_binding.Close();
   waiter_.WaitForEvent(CONNECTION_ERROR);
 }
 
 TEST_F(MojoProxyResolverFactoryImplTest,
        DisconnectFactoryDuringResolverCreation) {
   interfaces::ProxyResolverPtr proxy_resolver;
   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,
                  base::Unretained(this)));
   client_binding.set_connection_error_handler(
       base::Bind(&MojoProxyResolverFactoryImplTest::OnConnectionError,
                  base::Unretained(this)));
   waiter_.WaitForEvent(RESOLVER_CREATED);
   EXPECT_EQ(0, instances_destroyed_);
   ASSERT_EQ(1u, mock_factory_->requests_handled());
   factory_.reset();
   waiter_.WaitForEvent(CONNECTION_ERROR);
 }
 
 }  // namespace net