Split ProxyResolverV8Tracing into an implementation and a wrapper.

net/proxy/mojo_proxy_resolver_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_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/run_loop.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mock_proxy_resolver.h"
 #include "net/proxy/mojo_proxy_type_converters.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_server.h"
 #include "net/test/event_waiter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
 namespace net {
 namespace {
 
 class TestRequestClient : public interfaces::ProxyResolverRequestClient,
                           public mojo::ErrorHandler {
  public:
   enum Event {
     RESULT_RECEIVED,
-    LOAD_STATE_CHANGED,
     CONNECTION_ERROR,
   };
 
   explicit TestRequestClient(
       mojo::InterfaceRequest<interfaces::ProxyResolverRequestClient> request);
 
   void WaitForResult();
 
   Error error() { return error_; }
   const mojo::Array<interfaces::ProxyServerPtr>& results() { return results_; }
-  LoadState load_state() { return load_state_; }
   EventWaiter<Event>& event_waiter() { return event_waiter_; }
 
  private:
   // interfaces::ProxyResolverRequestClient override.
   void ReportResult(int32_t error,
                     mojo::Array<interfaces::ProxyServerPtr> results) override;
-  void LoadStateChanged(int32_t load_state) override;
 
   // mojo::ErrorHandler override.
   void OnConnectionError() override;
 
   bool done_ = false;
   Error error_ = ERR_FAILED;
-  LoadState load_state_ = LOAD_STATE_IDLE;
   mojo::Array<interfaces::ProxyServerPtr> results_;
 
   mojo::Binding<interfaces::ProxyResolverRequestClient> binding_;
 
   EventWaiter<Event> event_waiter_;
 };
 
 TestRequestClient::TestRequestClient(
     mojo::InterfaceRequest<interfaces::ProxyResolverRequestClient> request)
     : binding_(this, request.Pass()) {
@@ skipping 11 matching lines @@
 void TestRequestClient::ReportResult(
     int32_t error,
     mojo::Array<interfaces::ProxyServerPtr> results) {
   event_waiter_.NotifyEvent(RESULT_RECEIVED);
   ASSERT_FALSE(done_);
   error_ = static_cast<Error>(error);
   results_ = results.Pass();
   done_ = true;
 }
 
-void TestRequestClient::LoadStateChanged(int32_t load_state) {
-  event_waiter_.NotifyEvent(LOAD_STATE_CHANGED);
-  load_state_ = static_cast<LoadState>(load_state);
-}
-
 void TestRequestClient::OnConnectionError() {
   event_waiter_.NotifyEvent(CONNECTION_ERROR);
 }
 
 class CallbackMockProxyResolver : public MockAsyncProxyResolver {
  public:
   CallbackMockProxyResolver() {}
   ~CallbackMockProxyResolver() override;
 
   // MockAsyncProxyResolver overrides.
@@ skipping 56 matching lines @@
 }
 
 }  // namespace
 
 class MojoProxyResolverImplTest : public testing::Test {
  protected:
   void SetUp() override {
     scoped_ptr<CallbackMockProxyResolver> mock_resolver(
         new CallbackMockProxyResolver);
     mock_proxy_resolver_ = mock_resolver.get();
-    resolver_impl_.reset(new MojoProxyResolverImpl(
-        mock_resolver.Pass(),
-        base::Bind(&MojoProxyResolverImplTest::set_load_state_changed_callback,
-                   base::Unretained(this))));
+    resolver_impl_.reset(new MojoProxyResolverImpl(mock_resolver.Pass()));
     resolver_ = resolver_impl_.get();
   }
 
-  void set_load_state_changed_callback(
-      const ProxyResolver::LoadStateChangedCallback& callback) {
-    EXPECT_TRUE(load_state_changed_callback_.is_null());
-    EXPECT_FALSE(callback.is_null());
-    load_state_changed_callback_ = callback;
-  }
-
   CallbackMockProxyResolver* mock_proxy_resolver_;
 
   scoped_ptr<MojoProxyResolverImpl> resolver_impl_;
   interfaces::ProxyResolver* resolver_;
-  ProxyResolver::LoadStateChangedCallback load_state_changed_callback_;
 };
 
 TEST_F(MojoProxyResolverImplTest, GetProxyForUrl) {
   interfaces::ProxyResolverRequestClientPtr client_ptr;
   TestRequestClient client(mojo::GetProxy(&client_ptr));
 
   resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
   ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
   scoped_refptr<MockAsyncProxyResolver::Request> request =
       mock_proxy_resolver_->pending_requests()[0];
   EXPECT_EQ(GURL("http://example.com"), request->url());
 
-  ASSERT_FALSE(load_state_changed_callback_.is_null());
-  load_state_changed_callback_.Run(request.get(),
-                                   LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT);
-  client.event_waiter().WaitForEvent(TestRequestClient::LOAD_STATE_CHANGED);
-  EXPECT_EQ(LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT, client.load_state());
-
   request->results()->UsePacString(
       "PROXY proxy.example.com:1; "
       "SOCKS4 socks4.example.com:2; "
       "SOCKS5 socks5.example.com:3; "
       "HTTPS https.example.com:4; "
       "QUIC quic.example.com:65000; "
       "DIRECT");
   request->CompleteNow(OK);
   client.WaitForResult();
 
@@ skipping 123 matching lines @@
 
   resolver_->GetProxyForUrl("http://example.com", client_ptr.Pass());
   ASSERT_EQ(1u, mock_proxy_resolver_->pending_requests().size());
   scoped_refptr<MockAsyncProxyResolver::Request> request =
       mock_proxy_resolver_->pending_requests()[0];
   resolver_impl_.reset();
   client.event_waiter().WaitForEvent(TestRequestClient::CONNECTION_ERROR);
 }
 
 }  // namespace net