| Index: content/browser/loader/resource_request_info_impl.cc
|
| diff --git a/content/browser/loader/resource_request_info_impl.cc b/content/browser/loader/resource_request_info_impl.cc
|
| index 03d925ee7869dc35851883554e67dedefe7dec71..8db5e3445e8e9b9219e5ceb42a6d615b7a31dc21 100644
|
| --- a/content/browser/loader/resource_request_info_impl.cc
|
| +++ b/content/browser/loader/resource_request_info_impl.cc
|
| @@ -6,9 +6,9 @@
|
|
|
| #include "content/browser/loader/global_routing_id.h"
|
| #include "content/browser/loader/resource_message_filter.h"
|
| -#include "content/browser/worker_host/worker_service_impl.h"
|
| #include "content/common/net/url_request_user_data.h"
|
| #include "content/public/browser/global_request_id.h"
|
| +#include "content/public/common/process_type.h"
|
| #include "net/url_request/url_request.h"
|
|
|
| namespace content {
|
| @@ -206,18 +206,7 @@ bool ResourceRequestInfoImpl::WasIgnoredByHandler() const {
|
| bool ResourceRequestInfoImpl::GetAssociatedRenderFrame(
|
| int* render_process_id,
|
| int* render_frame_id) const {
|
| - // If the request is from the worker process, find a content that owns the
|
| - // worker.
|
| - if (process_type_ == PROCESS_TYPE_WORKER) {
|
| - // Need to display some related UI for this network request - pick an
|
| - // arbitrary parent to do so.
|
| - if (!WorkerServiceImpl::GetInstance()->GetRendererForWorker(
|
| - child_id_, render_process_id, render_frame_id)) {
|
| - *render_process_id = -1;
|
| - *render_frame_id = -1;
|
| - return false;
|
| - }
|
| - } else if (process_type_ == PROCESS_TYPE_PLUGIN) {
|
| + if (process_type_ == PROCESS_TYPE_PLUGIN) {
|
| *render_process_id = origin_pid_;
|
| *render_frame_id = render_frame_id_;
|
| } else {
|
|
|