1 files changed, 11 insertions, 12 deletions
diff --git a/chromium/content/browser/service_worker/service_worker_new_script_loader_unittest.cc b/chromium/content/browser/service_worker/service_worker_new_script_loader_unittest.cc
index 5664ba199c8..c034c9c80d5 100644
--- a/chromium/content/browser/service_worker/service_worker_new_script_loader_unittest.cc
+++ b/chromium/content/browser/service_worker/service_worker_new_script_loader_unittest.cc
@@ -13,8 +13,8 @@
 #include "content/browser/service_worker/service_worker_disk_cache.h"
 #include "content/browser/url_loader_factory_getter.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-#include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/system/data_pipe_utils.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_util.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
@@ -23,7 +23,7 @@
 #include "services/network/public/cpp/url_loader_completion_status.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "services/network/test/test_url_loader_client.h"
-#include "third_party/WebKit/public/mojom/service_worker/service_worker_registration.mojom.h"
+#include "third_party/blink/public/mojom/service_worker/service_worker_registration.mojom.h"
 
 namespace content {
 
@@ -99,8 +99,7 @@ class MockNetworkURLLoaderFactory final
       client->OnReceiveRedirect(net::RedirectInfo(), response_head);
       return;
     }
-    client->OnReceiveResponse(response_head, base::nullopt /* ssl_info */,
-                              nullptr /* downloaded_file */);
+    client->OnReceiveResponse(response_head, nullptr /* downloaded_file */);
 
     // Pass the response body to the client.
     uint32_t bytes_written = response.body.size();
@@ -302,8 +301,8 @@ TEST_F(ServiceWorkerNewScriptLoaderTest, Success) {
   EXPECT_TRUE(client_->has_received_response());
   EXPECT_TRUE(client_->response_body().is_valid());
   std::string response;
-  EXPECT_TRUE(mojo::common::BlockingCopyToString(
-      client_->response_body_release(), &response));
+  EXPECT_TRUE(
+      mojo::BlockingCopyToString(client_->response_body_release(), &response));
   EXPECT_EQ(mock_server_->Get(kScriptURL).body, response);
 
   // The response should also be stored in the storage.
@@ -326,8 +325,8 @@ TEST_F(ServiceWorkerNewScriptLoaderTest, Success_EmptyBody) {
   EXPECT_TRUE(client_->has_received_response());
   EXPECT_TRUE(client_->response_body().is_valid());
   std::string response;
-  EXPECT_TRUE(mojo::common::BlockingCopyToString(
-      client_->response_body_release(), &response));
+  EXPECT_TRUE(
+      mojo::BlockingCopyToString(client_->response_body_release(), &response));
   EXPECT_TRUE(response.empty());
 
   // The response should also be stored in the storage.
@@ -356,8 +355,8 @@ TEST_F(ServiceWorkerNewScriptLoaderTest, Success_LargeBody) {
   EXPECT_TRUE(client_->has_received_response());
   EXPECT_TRUE(client_->response_body().is_valid());
   std::string response;
-  EXPECT_TRUE(mojo::common::BlockingCopyToString(
-      client_->response_body_release(), &response));
+  EXPECT_TRUE(
+      mojo::BlockingCopyToString(client_->response_body_release(), &response));
   EXPECT_EQ(mock_server_->Get(kScriptURL).body, response);
 
   // The response should also be stored in the storage.
@@ -478,8 +477,8 @@ TEST_F(ServiceWorkerNewScriptLoaderTest, Success_PathRestriction) {
   EXPECT_TRUE(client_->has_received_response());
   EXPECT_TRUE(client_->response_body().is_valid());
   std::string response;
-  EXPECT_TRUE(mojo::common::BlockingCopyToString(
-      client_->response_body_release(), &response));
+  EXPECT_TRUE(
+      mojo::BlockingCopyToString(client_->response_body_release(), &response));
   EXPECT_EQ(mock_server_->Get(kScriptURL).body, response);
 
   // The response should also be stored in the storage.