Remove security_origin member from content::Stream.

content/browser/loader/resource_dispatcher_host_impl.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 
 #include <set>
 #include <vector>
@@ skipping 549 matching lines @@
   }
   return handler.Pass();
 }
 
 scoped_ptr<ResourceHandler>
 ResourceDispatcherHostImpl::MaybeInterceptAsStream(net::URLRequest* request,
                                                    ResourceResponse* response) {
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
   const std::string& mime_type = response->head.mime_type;
 
-  GURL security_origin;
+  GURL origin;
   std::string target_id;
   if (!delegate_ ||
       !delegate_->ShouldInterceptResourceAsStream(info->GetContext(),
                                                   request->url(),
                                                   mime_type,
-                                                  &security_origin,
+                                                  &origin,
                                                   &target_id)) {
     return scoped_ptr<ResourceHandler>();
   }
 
   StreamContext* stream_context =
       GetStreamContextForResourceContext(info->GetContext());
 
-
   scoped_ptr<StreamResourceHandler> handler(
       new StreamResourceHandler(request,
                                 stream_context->registry(),
-                                security_origin));
+                                origin));
 
   info->set_is_stream(true);
   delegate_->OnStreamCreated(
       info->GetContext(),
       info->GetChildID(),
       info->GetRouteID(),
       target_id,
       handler->stream()->CreateHandle(request->url(), mime_type),
       request->GetExpectedContentSize());
-  return (scoped_ptr<ResourceHandler>(handler.release())).Pass();
+  return handler.PassAs<ResourceHandler>();
 }
 
 void ResourceDispatcherHostImpl::ClearSSLClientAuthHandlerForRequest(
     net::URLRequest* request) {
   ResourceRequestInfoImpl* info = ResourceRequestInfoImpl::ForRequest(request);
   if (info) {
     ResourceLoader* loader = GetLoader(info->GetGlobalRequestID());
     if (loader)
       loader->ClearSSLClientAuthHandler();
   }
@@ skipping 1263 matching lines @@
   if ((load_flags & net::LOAD_REPORT_RAW_HEADERS)
       && !policy->CanReadRawCookies(child_id)) {
     VLOG(1) << "Denied unauthorized request for raw headers";
     load_flags &= ~net::LOAD_REPORT_RAW_HEADERS;
   }
 
   return load_flags;
 }
 
 }  // namespace content