Fix a null AppCacheBackendImpl ptr crash in CompleteCrossSiteTransfer and re…

content/browser/appcache/appcache_interceptor.cc

 // Copyright 2014 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 "content/browser/appcache/appcache_interceptor.h"
 
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_request_handler.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/browser/appcache/appcache_url_request_job.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/bad_message.h"
+#include "content/browser/loader/resource_message_filter.h"
 #include "content/common/appcache_interfaces.h"
 #include "net/url_request/url_request.h"
 
 static int kHandlerKey;  // Value is not used.
 
 namespace content {
 
 void AppCacheInterceptor::SetHandler(net::URLRequest* request,
                                      AppCacheRequestHandler* handler) {
   request->SetUserData(&kHandlerKey, handler);  // request takes ownership
@@ skipping 47 matching lines @@
     int old_process_id) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return;
   handler->PrepareForCrossSiteTransfer(old_process_id);
 }
 
 void AppCacheInterceptor::CompleteCrossSiteTransfer(
     net::URLRequest* request,
     int new_process_id,
-    int new_host_id) {
+    int new_host_id,
+    ResourceMessageFilter* filter) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return;
+  if (!handler->SanityCheckIsSameService(filter->appcache_service())) {
+    bad_message::ReceivedBadMessage(filter,
+                                    bad_message::ACI_WRONG_STORAGE_PARITION);

[nasko, 2016/01/15 19:38:24]

You have a missing T in PARTITION.

+    return;
+  }
   DCHECK_NE(kAppCacheNoHostId, new_host_id);
   handler->CompleteCrossSiteTransfer(new_process_id,
                                      new_host_id);
 }
 
 void AppCacheInterceptor::MaybeCompleteCrossSiteTransferInOldProcess(
     net::URLRequest* request,
     int process_id) {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
@@ skipping 28 matching lines @@
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
   return handler->MaybeLoadFallbackForResponse(request, network_delegate);
 }
 
 }  // namespace content