[ServiceWorker] pipe RequestContext and FrameType to ServiceWorker. [2/2 chromium]

content/browser/service_worker/service_worker_request_handler_unittest.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/service_worker/service_worker_request_handler.h"
 
 #include "base/run_loop.h"
 #include "content/browser/fileapi/mock_url_request_delegate.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/browser/service_worker/service_worker_provider_host.h"
 #include "content/browser/service_worker/service_worker_registration.h"
 #include "content/browser/service_worker/service_worker_utils.h"
 #include "content/common/resource_request_body.h"
+#include "content/public/common/request_context_frame_type.h"
+#include "content/public/common/request_context_type.h"
+#include "content/public/common/resource_type.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/url_request/url_request_context.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 int kMockRenderProcessId = 1224;
@@ skipping 51 matching lines @@
   }
 
   bool InitializeHandlerCheck(const std::string& url,
                               const std::string& method,
                               bool skip_service_worker,
                               ResourceType resource_type) {
     const GURL kDocUrl(url);
     scoped_ptr<net::URLRequest> request = url_request_context_.CreateRequest(
         kDocUrl, net::DEFAULT_PRIORITY, &url_request_delegate_, NULL);
     request->set_method(method);
-    ServiceWorkerRequestHandler::InitializeHandler(request.get(),
-                                                   context_wrapper(),
-                                                   &blob_storage_context_,
-                                                   kMockRenderProcessId,
-                                                   kMockProviderId,
-                                                   skip_service_worker,
-                                                   FETCH_REQUEST_MODE_NO_CORS,
-                                                   FETCH_CREDENTIALS_MODE_OMIT,
-                                                   resource_type,
-                                                   NULL);
+    ServiceWorkerRequestHandler::InitializeHandler(
+        request.get(),
+        context_wrapper(),
+        &blob_storage_context_,
+        kMockRenderProcessId,
+        kMockProviderId,
+        skip_service_worker,
+        FETCH_REQUEST_MODE_NO_CORS,
+        FETCH_CREDENTIALS_MODE_OMIT,
+        resource_type,
+        REQUEST_CONTEXT_TYPE_HYPERLINK,
+        REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL,
+        NULL);
     return ServiceWorkerRequestHandler::GetHandler(request.get()) != NULL;
   }
 
  protected:
   TestBrowserThreadBundle browser_thread_bundle_;
   scoped_ptr<EmbeddedWorkerTestHelper> helper_;
   scoped_refptr<ServiceWorkerRegistration> registration_;
   scoped_refptr<ServiceWorkerVersion> version_;
   base::WeakPtr<ServiceWorkerProviderHost> provider_host_;
   net::URLRequestContext url_request_context_;
@@ skipping 37 matching lines @@
   provider_host_->SetDocumentUrl(GURL(""));
   EXPECT_FALSE(InitializeHandlerCheck(
       "http://host/scope/doc", "GET", true, RESOURCE_TYPE_IMAGE));
   EXPECT_STREQ("", provider_host_->document_url().spec().c_str());
   EXPECT_FALSE(InitializeHandlerCheck(
       "https://host/scope/doc", "GET", true, RESOURCE_TYPE_IMAGE));
   EXPECT_STREQ("", provider_host_->document_url().spec().c_str());
 }
 
 }  // namespace content