Revert "Fix ErrorPageAutoReloadTest failures with Network Service."

This reverts commit 79668236.

Reason for revert:

Findit (https://goo.gl/kROfz5) identified CL at revision 518430 as the
culprit for failures in the build cycles as shown on:
https://findit-for-me.appspot.com/waterfall/culprit?key=ag9zfmZpbmRpdC1mb3ItbWVyRAsSDVdmU3VzcGVjdGVkQ0wiMWNocm9taXVtLzc5NjY4MjM2YzkzODMwMzBiZDRjYWNiMjA2ZDg4OTYxNjVmODZiN2MM

Sample Failed Build: https://ci.chromium.org/buildbot/chromium.chrome/Google%20Chrome%20Mac/28083

Original change's description:
> Fix ErrorPageAutoReloadTest failures with Network Service.
> 
> This CL creates a URLLoaderFactoryPtr based on the existing
> URLRequestInterceptor which fails the first N requests then
> begins allowing the loads.
> 
> If the network service feature flag is not set, we fall back
> to just using the old URLRequestInterceptor.
> 
> Relanding after adding common:interfaces to public_deps.
> 
> 
> Bug: 769401
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
> Change-Id: If9cda1d728161a7067d8d2f4f8d88b06e55059c9
> Reviewed-on: https://chromium-review.googlesource.com/782703
> Reviewed-by: John Abd-El-Malek <jam@chromium.org>
> Commit-Queue: Doug Turner <dougt@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#518430}

Change-Id: I49c1ff44c4e7aebffc09770c04a8b8e7d71e7862
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 769401
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_mojo
Reviewed-on: https://chromium-review.googlesource.com/783496
Cr-Commit-Position: refs/heads/master@{#518460}

content/browser/storage_partition_impl.cc

@@ -1018,12 +1018,6 @@ void StoragePartitionImpl::ClearBluetoothAllowedDevicesMapForTesting() {
   bluetooth_allowed_devices_map_->Clear();
 }
 
-void StoragePartitionImpl::SetNetworkFactoryForTesting(
-    mojom::URLLoaderFactoryPtr test_factory) {
-  url_loader_factory_getter_->SetNetworkFactoryForTesting(
-      std::move(test_factory));
-}
-
 BrowserContext* StoragePartitionImpl::browser_context() const {
   return browser_context_;
 }

content/browser/storage_partition_impl.h

@@ -117,8 +117,7 @@ class CONTENT_EXPORT StoragePartitionImpl
       const base::Closure& callback) override;
   void Flush() override;
   void ClearBluetoothAllowedDevicesMapForTesting() override;
-  void SetNetworkFactoryForTesting(
-      mojom::URLLoaderFactoryPtr 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;
@@ -197,11 +196,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::URLLoaderFactoryPtr test_factory) = 0;
-
  protected:
   virtual ~StoragePartition() {}
 };

content/public/common/BUILD.gn

@@ -267,7 +267,6 @@ source_set("common_sources") {
     ":interfaces",
     ":service_names",
     "//content/common",
-    "//content/public/common:interfaces",
     "//ipc",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",

content/public/test/test_storage_partition.cc

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

content/public/test/test_storage_partition.h

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

testing/buildbot/filters/mojo.fyi.network_browser_tests.filter

@@ -755,6 +755,9 @@
 
 # Switch test from using a custom net::URLRequestFileJob to using a test
 # URLLoaderFactory via SetNetworkFactoryForTesting.
+-ErrorPageAutoReloadTest.AutoReload
+-ErrorPageAutoReloadTest.IgnoresSameDocumentNavigation
+-ErrorPageAutoReloadTest.ManualReloadNotSuppressed
 -ErrorPageNavigationCorrectionsFailTest.StaleCacheStatusFailedCorrections
 -ErrorPageOfflineTestWithAllowDinosaurFalse.CheckEasterEggIsDisabled
 -ErrorPageTest.CheckEasterEggIsNotDisabled