Expose WebServiceWorkerNetworkProvider on DataSource

content/renderer/render_view_browsertest.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.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <tuple>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 48 matching lines @@
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/test/mock_keyboard.h"
 #include "content/test/test_render_frame.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_status_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
+#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
 #include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
 #include "third_party/WebKit/public/web/WebFrameContentDumper.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 #include "third_party/WebKit/public/web/WebInputMethodController.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPerformance.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebScriptSource.h"
@@ skipping 1870 matching lines @@
   view()->webview()->clearFocusedElement();
   const IPC::Message* msg3 = render_thread_->sink().GetFirstMessageMatching(
       FrameHostMsg_FocusedNodeChanged::ID);
   EXPECT_TRUE(msg3);
   FrameHostMsg_FocusedNodeChanged::Read(msg3, &params);
   EXPECT_FALSE(std::get<0>(params));
   render_thread_->sink().ClearMessages();
 }
 
 TEST_F(RenderViewImplTest, ServiceWorkerNetworkProviderSetup) {
-  ServiceWorkerNetworkProvider* provider = NULL;
-  RequestExtraData* extra_data = NULL;
+  blink::WebServiceWorkerNetworkProvider* webprovider = nullptr;
+  ServiceWorkerNetworkProvider* provider = nullptr;
+  RequestExtraData* extra_data = nullptr;
 
   // Make sure each new document has a new provider and
   // that the main request is tagged with the provider's id.
   LoadHTML("<b>A Document</b>");
   ASSERT_TRUE(GetMainFrame()->dataSource());
-  provider = ServiceWorkerNetworkProvider::FromDocumentState(
-      DocumentState::FromDataSource(GetMainFrame()->dataSource()));
-  ASSERT_TRUE(provider);
+  webprovider = GetMainFrame()->dataSource()->getServiceWorkerNetworkProvider();
+  ASSERT_TRUE(webprovider);
   extra_data = static_cast<RequestExtraData*>(
       GetMainFrame()->dataSource()->getRequest().getExtraData());
   ASSERT_TRUE(extra_data);
-  EXPECT_EQ(extra_data->service_worker_provider_id(),
-            provider->provider_id());
+  provider = ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
+      webprovider);
+  ASSERT_TRUE(provider);
+  EXPECT_EQ(extra_data->service_worker_provider_id(), provider->provider_id());
   int provider1_id = provider->provider_id();
 
   LoadHTML("<b>New Document B Goes Here</b>");
   ASSERT_TRUE(GetMainFrame()->dataSource());
-  provider = ServiceWorkerNetworkProvider::FromDocumentState(
-      DocumentState::FromDataSource(GetMainFrame()->dataSource()));
+  webprovider = GetMainFrame()->dataSource()->getServiceWorkerNetworkProvider();
+  ASSERT_TRUE(provider);
+  provider = ServiceWorkerNetworkProvider::FromWebServiceWorkerNetworkProvider(
+      webprovider);
   ASSERT_TRUE(provider);
   EXPECT_NE(provider1_id, provider->provider_id());
   extra_data = static_cast<RequestExtraData*>(
       GetMainFrame()->dataSource()->getRequest().getExtraData());
   ASSERT_TRUE(extra_data);
-  EXPECT_EQ(extra_data->service_worker_provider_id(),
-            provider->provider_id());
+  EXPECT_EQ(extra_data->service_worker_provider_id(), provider->provider_id());
 
   // See that subresource requests are also tagged with the provider's id.
   EXPECT_EQ(frame(), RenderFrameImpl::FromWebFrame(GetMainFrame()));
   blink::WebURLRequest request(GURL("http://foo.com"));
   request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
   blink::WebURLResponse redirect_response;
   frame()->willSendRequest(GetMainFrame(), request);
   extra_data = static_cast<RequestExtraData*>(request.getExtraData());
   ASSERT_TRUE(extra_data);
-  EXPECT_EQ(extra_data->service_worker_provider_id(),
-            provider->provider_id());
+  EXPECT_EQ(extra_data->service_worker_provider_id(), provider->provider_id());
 }
 
 TEST_F(RenderViewImplTest, OnSetAccessibilityMode) {
   ASSERT_EQ(AccessibilityModeOff, frame()->accessibility_mode());
   ASSERT_FALSE(frame()->render_accessibility());
 
   frame()->SetAccessibilityMode(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY);
   ASSERT_EQ(ACCESSIBILITY_MODE_WEB_CONTENTS_ONLY,
             frame()->accessibility_mode());
   ASSERT_TRUE(frame()->render_accessibility());
@@ skipping 581 matching lines @@
   ExpectPauseAndResume(3);
   blink::WebScriptSource source2(
       WebString::fromUTF8("function func2() { func1(); }; func2();"));
   frame()->GetWebFrame()->executeScriptInIsolatedWorld(17, &source2, 1);
 
   EXPECT_FALSE(IsPaused());
   Detach();
 }
 
 }  // namespace content