Sync the browser test host resolver with the network process before a test runs.

content/public/test/browser_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
+#include "content/public/test/test_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class CommandLine;
 class FilePath;
 }
 
-namespace net {
-class RuleBasedHostResolverProc;
-}  // namespace net
-
 namespace content {
 
 class BrowserTestBase : public testing::Test {
  public:
   BrowserTestBase();
   ~BrowserTestBase() override;
 
   // Configures everything for an in process browser test, then invokes
   // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop.
   void SetUp() override;
 
   // Restores state configured in SetUp.
   void TearDown() override;
 
   // Override this to add any custom setup code that needs to be done on the
   // main thread after the browser is created and just before calling
   // RunTestOnMainThread().
   virtual void SetUpOnMainThread() {}
 
   // Override this to add any custom teardown code that needs to be done on the
   // main thread right after RunTestOnMainThread().
   virtual void TearDownOnMainThread() {}
 
   // Override this to add command line flags specific to your test.
   virtual void SetUpCommandLine(base::CommandLine* command_line) {}
 
   // Returns the host resolver being used for the tests. Subclasses might want
   // to configure it inside tests.
   net::RuleBasedHostResolverProc* host_resolver() {
-    return rule_based_resolver_.get();
+    return test_host_resolver_->host_resolver();
   }
 
  protected:
   // We need these special methods because SetUp is the bottom of the stack
   // that winds up calling your test method, so it is not always an option
   // to do what you want by overriding it and calling the superclass version.
   //
   // Override this for things you would normally override SetUp for. It will be
   // called before your individual test fixture method is run, but after most
   // of the overhead initialization has occured.
@@ skipping 66 matching lines @@
   // Returns true if the test will be using GL acceleration via a software GL.
   bool UsingSoftwareGL() const;
 
   // Temporary
   // TODO(jam): remove this.
   void disable_io_checks() { disable_io_checks_ = true; }
 
  private:
   void ProxyRunTestOnMainThreadLoop();
 
+  // When using the network process, update the host resolver rules that were
+  // added in SetUpOnMainThread.
+  void InitializeNetworkProcess();
+
   // Testing server, started on demand.
   std::unique_ptr<net::SpawnedTestServer> spawned_test_server_;
 
   // Embedded test server, cheap to create, started on demand.
   std::unique_ptr<net::EmbeddedTestServer> embedded_test_server_;
 
   // Host resolver used during tests.
-  scoped_refptr<net::RuleBasedHostResolverProc> rule_based_resolver_;
+  std::unique_ptr<TestHostResolver> test_host_resolver_;
 
   // Expected exit code (default is 0).
   int expected_exit_code_;
 
   // When true, the compositor will produce pixel output that can be read back
   // for pixel tests.
   bool enable_pixel_output_;
 
   // When true, do compositing with the software backend instead of using GL.
   bool use_software_compositing_;
 
   // Whether SetUp was called. This value is checked in the destructor of this
   // class to ensure that SetUp was called. If it's not called, the test will
   // not run and report a false positive result.
   bool set_up_called_;
 
   // Tests should keep on the IO thread checks to test that production code
   // paths don't make file access. Keep this for now since src/chrome didn't
   // check this.
   bool disable_io_checks_;
 
 #if defined(OS_POSIX)
   bool handle_sigterm_;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_