Remove security_origin member from content::Stream.

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.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 "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 481 matching lines @@
 bool ChromeResourceDispatcherHostDelegate::ShouldForceDownloadResource(
     const GURL& url, const std::string& mime_type) {
   // Special-case user scripts to get downloaded instead of viewed.
   return extensions::UserScript::IsURLUserScript(url, mime_type);
 }
 
 bool ChromeResourceDispatcherHostDelegate::ShouldInterceptResourceAsStream(
     content::ResourceContext* resource_context,
     const GURL& url,
     const std::string& mime_type,
-    GURL* security_origin,
+    GURL* origin,
     std::string* target_id) {
 #if !defined(OS_ANDROID)
   ProfileIOData* io_data =
       ProfileIOData::FromResourceContext(resource_context);
   bool profile_is_incognito = io_data->is_incognito();
   const scoped_refptr<const ExtensionInfoMap> extension_info_map(
       io_data->GetExtensionInfoMap());
   std::vector<std::string> whitelist = MimeTypesHandler::GetMIMETypeWhitelist();
   // Go through the white-listed extensions and try to use them to intercept
   // the URL request.
   for (size_t i = 0; i < whitelist.size(); ++i) {
     const char* extension_id = whitelist[i].c_str();
     const Extension* extension =
         extension_info_map->extensions().GetByID(extension_id);
     // The white-listed extension may not be installed, so we have to NULL check
     // |extension|.
     if (!extension ||
         (profile_is_incognito &&
          !extension_info_map->IsIncognitoEnabled(extension_id))) {
       continue;
     }
 
     if (ExtensionCanHandleMimeType(extension, mime_type)) {
-      *security_origin = Extension::GetBaseURLFromExtensionId(extension_id);
+      *origin = Extension::GetBaseURLFromExtensionId(extension_id);
       *target_id = extension_id;
       return true;
     }
   }
 #endif
   return false;
 }
 
 void ChromeResourceDispatcherHostDelegate::OnStreamCreated(
     content::ResourceContext* resource_context,
@@ skipping 96 matching lines @@
   if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) &&
       ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
           &child_id, &route_id) &&
       prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) {
     ReportUnsupportedPrerenderScheme(redirect_url);
     prerender_tracker_->TryCancel(
         child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME);
     request->Cancel();
   }
 }