[ServiceWorker] Move skip_service_worker flag from RequestExtraData to RequestInfo.

content/child/resource_dispatcher.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/child/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 108 matching lines @@
   request_.referrer_policy = request_info.referrer_policy;
   request_.headers = request_info.headers;
   request_.load_flags = request_info.load_flags;
   request_.origin_pid = request_info.requestor_pid;
   request_.resource_type = request_info.request_type;
   request_.priority = request_info.priority;
   request_.request_context = request_info.request_context;
   request_.appcache_host_id = request_info.appcache_host_id;
   request_.download_to_file = request_info.download_to_file;
   request_.has_user_gesture = request_info.has_user_gesture;
+  request_.skip_service_worker = request_info.skip_service_worker;
   request_.enable_load_timing = request_info.enable_load_timing;
 
   const RequestExtraData kEmptyData;
   const RequestExtraData* extra_data;
   if (request_info.extra_data)
     extra_data = static_cast<RequestExtraData*>(request_info.extra_data);
   else
     extra_data = &kEmptyData;
   request_.visiblity_state = extra_data->visibility_state();
   request_.render_frame_id = extra_data->render_frame_id();
   request_.is_main_frame = extra_data->is_main_frame();
   request_.parent_is_main_frame = extra_data->parent_is_main_frame();
   request_.parent_render_frame_id = extra_data->parent_render_frame_id();
   request_.allow_download = extra_data->allow_download();
   request_.transition_type = extra_data->transition_type();
   request_.should_replace_current_entry =
       extra_data->should_replace_current_entry();
   request_.transferred_request_child_id =
       extra_data->transferred_request_child_id();
   request_.transferred_request_request_id =
       extra_data->transferred_request_request_id();
   request_.service_worker_provider_id =
       extra_data->service_worker_provider_id();
-  request_.skip_service_worker = extra_data->skip_service_worker();
   frame_origin_ = extra_data->frame_origin();
 }
 
 IPCResourceLoaderBridge::~IPCResourceLoaderBridge() {
   // we remove our hook for the resource dispatcher only when going away, since
   // it doesn't keep track of whether we've force terminated the request
   if (request_id_ >= 0) {
     // this operation may fail, as the dispatcher will have preemptively
     // removed us when the renderer sends the ReceivedAllData message.
     dispatcher_->RemovePendingRequest(request_id_);
@@ skipping 712 matching lines @@
 void ResourceDispatcher::ReleaseResourcesInMessageQueue(MessageQueue* queue) {
   while (!queue->empty()) {
     IPC::Message* message = queue->front();
     ReleaseResourcesInDataMessage(*message);
     queue->pop_front();
     delete message;
   }
 }
 
 }  // namespace content