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

content/shell/utility/shell_content_utility_client.h

Index: content/shell/utility/shell_content_utility_client.h
diff --git a/content/shell/utility/shell_content_utility_client.h b/content/shell/utility/shell_content_utility_client.h
index 3ab2f82bc7af9a185ce001c25d1bd637e7a8ef07..9e424878b10e54e76b6acba59da102398e81d2fc 100644
--- a/content/shell/utility/shell_content_utility_client.h
+++ b/content/shell/utility/shell_content_utility_client.h
@@ -5,17 +5,34 @@
 #ifndef CONTENT_SHELL_UTILITY_SHELL_CONTENT_UTILITY_CLIENT_H_
 #define CONTENT_SHELL_UTILITY_SHELL_CONTENT_UTILITY_CLIENT_H_
 
+#include "base/macros.h"
+#include "content/public/common/network_service_test.mojom.h"
 #include "content/public/utility/content_utility_client.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
 
 namespace content {
 
-class ShellContentUtilityClient : public ContentUtilityClient {
+class ShellContentUtilityClient
+    : public ContentUtilityClient,
+      public service_manager::InterfaceFactory<mojom::NetworkServiceTest> {
  public:
+  ShellContentUtilityClient();
   ~ShellContentUtilityClient() override;
 
   // ContentUtilityClient:
   void UtilityThreadStarted() override;
   void RegisterServices(StaticServiceMap* services) override;
+  void RegisterNetworkServices(

[Ken Rockot(use gerrit already), 2017/04/25 17:36:09]

nit: RegisterNetworkBinders?

[jam, 2017/04/25 18:19:37]

Done.

+      service_manager::BinderRegistry* registry) override;
+
+  // service_manager::InterfaceFactory<mojom::NetworkServiceTest>:
+  void Create(const service_manager::Identity& remote_identity,

[Ken Rockot(use gerrit already), 2017/04/25 17:36:09]

nit: Could be private. Also having a Create method is kinda weird on a class
that isn't dedicated to the interface(s) it's creating, so I'd kinda prefer we
just used Bind internally instead of InterfaceFactory. Your call.

[jam, 2017/04/25 18:19:37]

Done.

+              mojom::NetworkServiceTestRequest request) override;
+
+ private:
+  std::unique_ptr<mojom::NetworkServiceTest> network_service_test_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShellContentUtilityClient);
 };
 
 }  // namespace content