Cleanup: Remove the implicit constructor for BoundNetLog that allowed passing...

net/proxy/single_threaded_proxy_resolver_unittest.cc

 // Copyright (c) 2009 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 "base/waitable_event.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_log.h"
 #include "net/base/net_log_unittest.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 160 matching lines @@
 
   // The mock proxy resolver should have written 1 log entry. And
   // on completion, this should have been copied into |log0|.
   EXPECT_EQ(1u, log0.entries().size());
 
   // Start 3 more requests (request1 to request3).
 
   TestCompletionCallback callback1;
   ProxyInfo results1;
   rv = resolver.GetProxyForURL(
-      GURL("http://request1"), &results1, &callback1, NULL, NULL);
+      GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   TestCompletionCallback callback2;
   ProxyInfo results2;
   rv = resolver.GetProxyForURL(
-      GURL("http://request2"), &results2, &callback2, NULL, NULL);
+      GURL("http://request2"), &results2, &callback2, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   TestCompletionCallback callback3;
   ProxyInfo results3;
   rv = resolver.GetProxyForURL(
-      GURL("http://request3"), &results3, &callback3, NULL, NULL);
+      GURL("http://request3"), &results3, &callback3, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Wait for the requests to finish (they must finish in the order they were
   // started, which is what we check for from their magic return value)
 
   rv = callback1.WaitForResult();
   EXPECT_EQ(1, rv);
   EXPECT_EQ("PROXY request1:80", results1.ToPacString());
 
   rv = callback2.WaitForResult();
@@ skipping 96 matching lines @@
   int rv;
 
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
   // Start request 0.
   ProxyResolver::RequestHandle request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   rv = resolver.GetProxyForURL(
-      GURL("http://request0"), &results0, &callback0, &request0, NULL);
+      GURL("http://request0"), &results0, &callback0, &request0, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Wait until requests 0 reaches the worker thread.
   mock->WaitUntilBlocked();
 
   // Start 3 more requests (request1 : request3).
 
   TestCompletionCallback callback1;
   ProxyInfo results1;
   rv = resolver.GetProxyForURL(
-      GURL("http://request1"), &results1, &callback1, NULL, NULL);
+      GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   ProxyResolver::RequestHandle request2;
   TestCompletionCallback callback2;
   ProxyInfo results2;
   rv = resolver.GetProxyForURL(
-      GURL("http://request2"), &results2, &callback2, &request2, NULL);
+      GURL("http://request2"), &results2, &callback2, &request2, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   TestCompletionCallback callback3;
   ProxyInfo results3;
   rv = resolver.GetProxyForURL(
-      GURL("http://request3"), &results3, &callback3, NULL, NULL);
+      GURL("http://request3"), &results3, &callback3, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Cancel request0 (inprogress) and request2 (pending).
   resolver.CancelRequest(request0);
   resolver.CancelRequest(request2);
 
   // Unblock the worker thread so the requests can continue running.
   mock->Unblock();
 
   // Wait for requests 1 and 3 to finish.
@@ skipping 24 matching lines @@
   int rv;
 
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
   // Start 3 requests.
 
   TestCompletionCallback callback0;
   ProxyInfo results0;
   rv = resolver->GetProxyForURL(
-      GURL("http://request0"), &results0, &callback0, NULL, NULL);
+      GURL("http://request0"), &results0, &callback0, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   TestCompletionCallback callback1;
   ProxyInfo results1;
   rv = resolver->GetProxyForURL(
-      GURL("http://request1"), &results1, &callback1, NULL, NULL);
+      GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   TestCompletionCallback callback2;
   ProxyInfo results2;
   rv = resolver->GetProxyForURL(
-      GURL("http://request2"), &results2, &callback2, NULL, NULL);
+      GURL("http://request2"), &results2, &callback2, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Wait until request 0 reaches the worker thread.
   mock->WaitUntilBlocked();
 
   // Add some latency, to improve the chance that when
   // SingleThreadedProxyResolver is deleted below we are still running inside
   // of the worker thread. The test will pass regardless, so this race doesn't
   // cause flakiness. However the destruction during execution is a more
   // interesting case to test.
@@ skipping 21 matching lines @@
   int rv;
 
   // Block the proxy resolver, so no request can complete.
   mock->Block();
 
   // Start request 0.
   ProxyResolver::RequestHandle request0;
   TestCompletionCallback callback0;
   ProxyInfo results0;
   rv = resolver.GetProxyForURL(
-      GURL("http://request0"), &results0, &callback0, &request0, NULL);
+      GURL("http://request0"), &results0, &callback0, &request0, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Wait until requests 0 reaches the worker thread.
   mock->WaitUntilBlocked();
 
   TestCompletionCallback set_pac_script_callback;
   rv = resolver.SetPacScriptByData("data", &set_pac_script_callback);
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Cancel the SetPacScriptByData request (it can't have finished yet,
   // since the single-thread is currently blocked).
   resolver.CancelSetPacScript();
 
   // Start 1 more request.
 
   TestCompletionCallback callback1;
   ProxyInfo results1;
   rv = resolver.GetProxyForURL(
-      GURL("http://request1"), &results1, &callback1, NULL, NULL);
+      GURL("http://request1"), &results1, &callback1, NULL, BoundNetLog());
   EXPECT_EQ(ERR_IO_PENDING, rv);
 
   // Unblock the worker thread so the requests can continue running.
   mock->Unblock();
 
   // Wait for requests 0 and 1 to finish.
 
   rv = callback0.WaitForResult();
   EXPECT_EQ(0, rv);
   EXPECT_EQ("PROXY request0:80", results0.ToPacString());
 
   rv = callback1.WaitForResult();
   EXPECT_EQ(1, rv);
   EXPECT_EQ("PROXY request1:80", results1.ToPacString());
 
   // The SetPacScript callback should never have been completed.
   EXPECT_FALSE(set_pac_script_callback.have_result());
 }
 
 }  // namespace
 }  // namespace net