Use Independent URLLoader

content/network/url_loader_unittest.cc

 // Copyright 2017 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 "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/loader/test_url_loader_client.h"
@@ skipping 60 matching lines @@
 
   void SetUp() override {
     test_server_.AddDefaultHandlers(
         base::FilePath(FILE_PATH_LITERAL("content/test/data")));
     ASSERT_TRUE(test_server_.Start());
   }
 
   void Load(const GURL& url,
             TestURLLoaderClient* client,
             uint32_t options = 0) {
-    mojom::URLLoaderAssociatedPtr loader;
+    mojom::URLLoaderPtr loader;
 
     ResourceRequest request =
         CreateResourceRequest("GET", RESOURCE_TYPE_MAIN_FRAME, url);
 
-    URLLoaderImpl loader_impl(context(), mojo::MakeIsolatedRequest(&loader),
-                              options, request, client->CreateInterfacePtr(),
+    URLLoaderImpl loader_impl(context(), mojo::MakeRequest(&loader), options,
+                              request, client->CreateInterfacePtr(),
                               TRAFFIC_ANNOTATION_FOR_TESTS);
 
     client->RunUntilComplete();
   }
 
   void LoadAndCompareFile(const std::string& path) {
     TestURLLoaderClient client;
     GURL url = test_server()->GetURL(std::string("/") + path);
     Load(url, &client);
 
@@ skipping 57 matching lines @@
   Load(url, &client, 0);
   ASSERT_FALSE(!!client.ssl_info());
 }
 
 TEST_F(URLLoaderImplTest, DestroyContextWithLiveRequest) {
   TestURLLoaderClient client;
   GURL url = test_server()->GetURL("/hung-after-headers");
   ResourceRequest request =
       CreateResourceRequest("GET", RESOURCE_TYPE_MAIN_FRAME, url);
 
-  mojom::URLLoaderAssociatedPtr loader;
+  mojom::URLLoaderPtr loader;
   // The loader is implicitly owned by the client and the NetworkContext, so
   // don't hold on to a pointer to it.
   base::WeakPtr<URLLoaderImpl> loader_impl =
-      (new URLLoaderImpl(context(), mojo::MakeIsolatedRequest(&loader), 0,
-                         request, client.CreateInterfacePtr(),
+      (new URLLoaderImpl(context(), mojo::MakeRequest(&loader), 0, request,
+                         client.CreateInterfacePtr(),
                          TRAFFIC_ANNOTATION_FOR_TESTS))
           ->GetWeakPtrForTests();
 
   client.RunUntilResponseReceived();
   EXPECT_TRUE(client.has_received_response());
   EXPECT_FALSE(client.has_received_completion());
 
   // Request hasn't completed, so the loader should not have been destroyed.
   EXPECT_TRUE(loader_impl);
 
   // Destroying the context should result in destroying the loader and the
   // client receiving a connection error.
   DestroyContext();
   EXPECT_FALSE(loader_impl);
 
   client.RunUntilConnectionError();
   EXPECT_FALSE(client.has_received_completion());
   EXPECT_EQ(0u, client.download_data_length());
 }
 
 }  // namespace content