Make UrlRequestContextBuilder take scoped_ptr's

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index a13d585ccd57bdd3b85ba5b7a6e2dbe982555983..181e10dca59712cd25b173feebd49fff82b805da 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -132,6 +132,7 @@ class ContainerURLRequestContext : public URLRequestContext {
   explicit ContainerURLRequestContext(
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
       : file_task_runner_(file_task_runner), storage_(this) {}
+  ~ContainerURLRequestContext() override { AssertNoURLRequests(); }
 
   URLRequestContextStorage* storage() {
     return &storage_;
@@ -154,9 +155,6 @@ class ContainerURLRequestContext : public URLRequestContext {
     transport_security_persister = transport_security_persister.Pass();
   }
 
- protected:
-  ~ContainerURLRequestContext() override { AssertNoURLRequests(); }
-
  private:
   // The thread should be torn down last.
   scoped_ptr<base::Thread> file_thread_;
@@ -208,7 +206,8 @@ URLRequestContextBuilder::URLRequestContextBuilder()
       http_cache_enabled_(true),
       throttling_enabled_(false),
       backoff_enabled_(false),
-      sdch_enabled_(false) {
+      sdch_enabled_(false),
+      net_log_(nullptr) {
 }
 
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
@@ -253,9 +252,9 @@ void URLRequestContextBuilder::SetHttpServerProperties(
   http_server_properties_ = http_server_properties.Pass();
 }
 
-URLRequestContext* URLRequestContextBuilder::Build() {
-  ContainerURLRequestContext* context =
-      new ContainerURLRequestContext(file_task_runner_);
+scoped_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
+  scoped_ptr<ContainerURLRequestContext> context(
+      new ContainerURLRequestContext(file_task_runner_));
   URLRequestContextStorage* storage = context->storage();
 
   storage->set_http_user_agent_settings(new StaticHttpUserAgentSettings(
@@ -267,7 +266,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
   storage->set_network_delegate(network_delegate);
 
   if (net_log_) {

[mmenke, 2015/08/20 15:51:07]

Again, suggest a short comment about this.

[pauljensen, 2015/08/20 21:45:14]

Done.

-    storage->set_net_log(net_log_.release());
+    context->set_net_log(net_log_);
   } else {
     storage->set_net_log(new NetLog);
   }
@@ -444,7 +443,7 @@ URLRequestContext* URLRequestContextBuilder::Build() {
   storage->set_job_factory(top_job_factory.release());
   // TODO(willchan): Support sdch.
 
-  return context;
+  return context.Pass();
 }
 
 }  // namespace net