Change Interceptors into URLRequestJobFactory::ProtocolHandlers.

net/url_request/url_request_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shlobj.h>
 #endif
@@ skipping 36 matching lines @@
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/ocsp/nss_ocsp.h"
 #include "net/proxy/proxy_service.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/test/test_server.h"
 #include "net/url_request/ftp_protocol_handler.h"
+#include "net/url_request/protocol_intercept_job_factory.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_file_dir_job.h"
 #include "net/url_request/url_request_http_job.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_redirect_job.h"
 #include "net/url_request/url_request_test_job.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
@@ skipping 390 matching lines @@
 
 }  // namespace
 
 // Inherit PlatformTest since we require the autorelease pool on Mac OS X.f
 class URLRequestTest : public PlatformTest {
  public:
   URLRequestTest() : default_context_(true) {
     default_context_.set_network_delegate(&default_network_delegate_);
     default_context_.Init();
   }
+  virtual ~URLRequestTest() {}
 
   // Adds the TestJobInterceptor to the default context.
   TestJobInterceptor* AddTestInterceptor() {
-    TestJobInterceptor* interceptor = new TestJobInterceptor();
-    default_context_.set_job_factory(&job_factory_);
-    job_factory_.AddInterceptor(interceptor);
-    return interceptor;
+    TestJobInterceptor* protocol_handler_ = new TestJobInterceptor();
+    job_factory_.reset(new URLRequestJobFactoryImpl);

[erikwright (departed), 2012/12/06 15:26:28]

Is there a reason why this should be a ProtocolInterceptJobFactory wrapping an
empty URLRequestJobFactoryImpl if no-one ever accesses the mutators?

Couldn't it just be an URLRequestJobFactoryImpl with a single ProtocolHandler
then?

Or couldn't we do one of:

1) make the mutators in ProtocolInterceptJobFactory not forward to the wrapped
factory, or
2) create a new URLRequestJobFactory implementation that only holds a single
ProtocolHandler and NOTREACHED()'s all mutators?

[pauljensen, 2012/12/07 18:47:42]

TestJobInterceptor only intercepts the first HTTP request, any subsequent HTTP
requests or non-HTTP requests will be handled by the default static
URLRequest::ProtocolFactory's in URLRequestJobManager.  I was trying to maintain
this exact behavior.  After looking at users of TestJobInterceptor, it looks
like the tests don't actually need to rely on the default static
URLRequest::ProtocolFactory's, so I guess the answer is I could just call
URLRequestJobFactoryImpl::SetProtocolHandler().
Why the concern about mutators?  I thought these were going away imminently.

[erikwright (departed), 2012/12/07 20:12:05]

OK, I see.
It's just that I noticed that you had converted the mutators in the
ProtocolInterceptJobFactory from NOTREACHED to forwarding, which leads me to
wonder who's relying on them (as they will presumably present a problem when we
do attempt to remove them).

If it doesn't break anyone, I'd leave the NOTREACHED, but ultimately I'm also OK
to worry about that separately.

[pauljensen, 2012/12/09 23:14:12]

For now they must pass things like SetProtocolHandler() onto |job_factory_|
until crrev.com/11308362 lands.

+    job_factory_.reset(new ProtocolInterceptJobFactory(job_factory_.Pass(),
+                                                       "http",
+                                                       protocol_handler_));
+    default_context_.set_job_factory(job_factory_.get());
+    return protocol_handler_;
   }
 
  protected:
   TestNetworkDelegate default_network_delegate_;  // Must outlive URLRequest.
-  URLRequestJobFactoryImpl job_factory_;
+  scoped_ptr<URLRequestJobFactory> job_factory_;
   TestURLRequestContext default_context_;
 };
 
 TEST_F(URLRequestTest, AboutBlankTest) {
   TestDelegate d;
   {
     URLRequest r(GURL("about:blank"), &d, &default_context_);
 
     r.Start();
     EXPECT_TRUE(r.is_pending());
@@ skipping 4676 matching lines @@
 
     EXPECT_FALSE(r.is_pending());
     EXPECT_EQ(1, d->response_started_count());
     EXPECT_FALSE(d->received_data_before_response());
     EXPECT_EQ(d->bytes_received(), static_cast<int>(file_size));
   }
 }
 #endif  // !defined(DISABLE_FTP_SUPPORT)
 
 }  // namespace net