Index: chrome/browser/renderer_host/resource_dispatcher_host.cc |
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc |
index 726242a4c915c52aa2ee3dd1bb4b5c303cf33606..73f54b69d9bb59b8e16dc03411119eedfeccb263 100644 |
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc |
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc |
@@ -196,13 +196,13 @@ std::vector<int> GetAllNetErrorCodes() { |
} |
#if defined(OS_WIN) |
-#pragma warning (disable: 4748) |
-#pragma optimize( "", off ) |
+#pragma warning(disable: 4748) |
+#pragma optimize("", off) |
#endif |
#if defined(OS_WIN) |
-#pragma optimize( "", on ) |
-#pragma warning (default: 4748) |
+#pragma optimize("", on) |
+#pragma warning(default: 4748) |
#endif |
} // namespace |
@@ -518,8 +518,8 @@ void ResourceDispatcherHost::BeginRequest( |
ApplyExtensionLocalizationFilter(request_data.url, request_data.resource_type, |
extra_info); |
SetRequestInfo(request, extra_info); // Request takes ownership. |
- chrome_browser_net::SetOriginProcessUniqueIDForRequest( |
- request_data.origin_child_id, request); |
+ chrome_browser_net::SetOriginProcessIDForRequest( |
+ request_data.origin_pid, request); |
if (request->url().SchemeIs(chrome::kBlobScheme) && context) { |
// Hang on to a reference to ensure the blob is not released prior |
@@ -733,7 +733,6 @@ void ResourceDispatcherHost::BeginDownload( |
ResourceDispatcherHostRequestInfo* extra_info = |
CreateRequestInfoForBrowserRequest(handler, child_id, route_id, true); |
SetRequestInfo(request, extra_info); // Request takes ownership. |
- chrome_browser_net::SetOriginProcessUniqueIDForRequest(child_id, request); |
jam
2011/02/03 22:58:07
why take this out?
|
BeginRequestInternal(request); |
} |
@@ -781,7 +780,6 @@ void ResourceDispatcherHost::BeginSaveFile( |
ResourceDispatcherHostRequestInfo* extra_info = |
CreateRequestInfoForBrowserRequest(handler, child_id, route_id, false); |
SetRequestInfo(request, extra_info); // Request takes ownership. |
- chrome_browser_net::SetOriginProcessUniqueIDForRequest(child_id, request); |
jam
2011/02/03 22:58:07
ditto
|
BeginRequestInternal(request); |
} |