Switch ErrorPageTest tests to use the new URLLoaderInterceptor helper.

BUG=776589

Change-Id: I74130c4be9037a4f3204fac90180a79c4fe6e026
Reviewed-on: https://chromium-review.googlesource.com/806754Reviewed-by: Doug Turner <dougt@chromium.org>
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521761}

content/browser/storage_partition_impl.cc

@@ -1017,11 +1017,6 @@ void StoragePartitionImpl::ClearBluetoothAllowedDevicesMapForTesting() {
   bluetooth_allowed_devices_map_->Clear();
 }
 
-void StoragePartitionImpl::SetNetworkFactoryForTesting(
-    mojom::URLLoaderFactory* test_factory) {
-  url_loader_factory_getter_->SetNetworkFactoryForTesting(test_factory);
-}
-
 BrowserContext* StoragePartitionImpl::browser_context() const {
   return browser_context_;
 }

content/browser/storage_partition_impl.h

@@ -117,8 +117,6 @@ class CONTENT_EXPORT StoragePartitionImpl
       base::OnceClosure callback) override;
   void Flush() override;
   void ClearBluetoothAllowedDevicesMapForTesting() override;
-  void SetNetworkFactoryForTesting(
-      mojom::URLLoaderFactory* test_factory) override;
   BackgroundFetchContext* GetBackgroundFetchContext();
   BackgroundSyncContext* GetBackgroundSyncContext();
   PaymentAppContextImpl* GetPaymentAppContext();

content/public/browser/storage_partition.h

@@ -13,7 +13,6 @@
 #include "base/files/file_path.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
-#include "content/public/common/url_loader_factory.mojom.h"
 #include "net/cookies/cookie_store.h"
 
 class GURL;
@@ -195,11 +194,6 @@ class CONTENT_EXPORT StoragePartition {
   // Clear the bluetooth allowed devices map. For test use only.
   virtual void ClearBluetoothAllowedDevicesMapForTesting() = 0;
 
-  // Overrides the network URLLoaderFactory for subsequent requests. Passing a
-  // null pointer will restore the default behavior.
-  virtual void SetNetworkFactoryForTesting(
-      mojom::URLLoaderFactory* test_factory) = 0;
-
  protected:
   virtual ~StoragePartition() {}
 };

content/public/test/test_storage_partition.cc

@@ -116,7 +116,4 @@ void TestStoragePartition::Flush() {}
 
 void TestStoragePartition::ClearBluetoothAllowedDevicesMapForTesting() {}
 
-void TestStoragePartition::SetNetworkFactoryForTesting(
-    mojom::URLLoaderFactory* test_factory) {}
-
 }  // namespace content

content/public/test/test_storage_partition.h

@@ -155,9 +155,6 @@ class TestStoragePartition : public StoragePartition {
 
   void ClearBluetoothAllowedDevicesMapForTesting() override;
 
-  void SetNetworkFactoryForTesting(
-      mojom::URLLoaderFactory* test_factory) override;
-
  private:
   base::FilePath file_path_;
   net::URLRequestContextGetter* url_request_context_getter_ = nullptr;