Shift URLRequestContextStorage over to taking scoped_ptrs.

net/websockets/websocket_test_util.cc

 // Copyright 2013 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/websockets/websocket_test_util.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 146 matching lines @@
 }
 
 void WebSocketTestURLRequestContextHost::AddSSLSocketDataProvider(
     scoped_ptr<SSLSocketDataProvider> ssl_socket_data) {
   maker_.AddSSLSocketDataProvider(ssl_socket_data.Pass());
 }
 
 void WebSocketTestURLRequestContextHost::SetProxyConfig(
     const std::string& proxy_rules) {
   DCHECK(!url_request_context_initialized_);
-  proxy_service_.reset(ProxyService::CreateFixed(proxy_rules));
+  proxy_service_ = ProxyService::CreateFixed(proxy_rules);
   url_request_context_.set_proxy_service(proxy_service_.get());
 }
 
 TestURLRequestContext*
 WebSocketTestURLRequestContextHost::GetURLRequestContext() {
   if (!url_request_context_initialized_) {
     url_request_context_.Init();
     // A Network Delegate is required to make the URLRequest::Delegate work.
     url_request_context_.set_network_delegate(&network_delegate_);
     url_request_context_initialized_ = true;
   }
   return &url_request_context_;
 }
 
 }  // namespace net