Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/loader/url_loader_factory_impl_unittest.cc

 // Copyright 2016 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/loader/url_loader_factory_impl.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "content/browser/loader/mojo_async_resource_handler.h"
+#include "content/browser/loader/navigation_resource_throttle.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/test_url_loader_client.h"
 #include "content/browser/loader_delegate_impl.h"
 #include "content/common/resource_request.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/url_loader.mojom.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/common/content_paths.h"
@@ skipping 90 matching lines @@
   LoaderDelegateImpl loader_deleate_;
   ResourceDispatcherHostImpl rdh_;
   std::unique_ptr<TestBrowserContext> browser_context_;
   scoped_refptr<ResourceMessageFilter> resource_message_filter_;
   mojom::URLLoaderFactoryPtr factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLLoaderFactoryImplTest);
 };
 
 TEST_P(URLLoaderFactoryImplTest, GetResponse) {
+  NavigationResourceThrottle::SetUIChecksAlwaysSuccedForTesting(true);
   mojom::URLLoaderPtr loader;
   base::FilePath root;
   PathService::Get(DIR_TEST_DATA, &root);
   net::URLRequestMockHTTPJob::AddUrlHandlers(root,
                                              BrowserThread::GetBlockingPool());
   ResourceRequest request;
   TestURLLoaderClient client;
   // Assume the file contents is small enough to be stored in the data pipe.
   request.url = net::URLRequestMockHTTPJob::GetMockUrl("hello.html");
   request.method = "GET";
@@ skipping 35 matching lines @@
     ASSERT_EQ(MOJO_RESULT_OK, r);
     contents += std::string(buffer, read_size);
   }
   std::string expected;
   base::ReadFileToString(
       root.Append(base::FilePath(FILE_PATH_LITERAL("hello.html"))), &expected);
   EXPECT_EQ(expected, contents);
 }
 
 TEST_P(URLLoaderFactoryImplTest, GetFailedResponse) {
+  NavigationResourceThrottle::SetUIChecksAlwaysSuccedForTesting(true);
   mojom::URLLoaderPtr loader;
   ResourceRequest request;
   TestURLLoaderClient client;
   net::URLRequestFailedJob::AddUrlHandler();
   request.url = net::URLRequestFailedJob::GetMockHttpUrlWithFailurePhase(
       net::URLRequestFailedJob::START, net::ERR_TIMED_OUT);
   request.method = "GET";
   factory_->CreateLoaderAndStart(mojo::GetProxy(&loader), 1, request,
                                  client.CreateInterfacePtrAndBind());
 
@@ skipping 43 matching lines @@
   EXPECT_EQ(net::ERR_ABORTED, client.completion_status().error_code);
 }
 
 INSTANTIATE_TEST_CASE_P(URLLoaderFactoryImplTest,
                         URLLoaderFactoryImplTest,
                         ::testing::Values(128, 32 * 1024));
 
 }  // namespace
 
 }  // namespace content