Add support in the network service for different contexts.

content/network/network_service.h

Index: content/network/network_service.h
diff --git a/content/network/network_service.h b/content/network/network_service.h
index 3641e0402657333df02b22ca5d2905c82b25a815..e139546dd91e0850db7c5bdc7f54cfcbfd620ccb 100644
--- a/content/network/network_service.h
+++ b/content/network/network_service.h
@@ -9,10 +9,7 @@
 
 #include "base/macros.h"
 #include "content/common/network_service.mojom.h"
-#include "content/common/url_loader_factory.mojom.h"
-#include "content/network/network_context.h"
-#include "mojo/public/cpp/bindings/binding_set.h"
-#include "mojo/public/cpp/bindings/strong_binding_set.h"
+#include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 
@@ -26,30 +23,25 @@ class NetworkService : public service_manager::Service,
   ~NetworkService() override;
 
  private:
+  class MojoNetLog;
+
   // service_manager::Service implementation.
   void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override;
 
-  void CreateURLLoaderFactory(
-      const service_manager::BindSourceInfo& source_info,
-      mojom::URLLoaderFactoryRequest request);
-  void CreateNetworkService(const service_manager::BindSourceInfo& source_info,
-                            mojom::NetworkServiceRequest request);
+  void Create(const service_manager::BindSourceInfo& source_info,
+              mojom::NetworkServiceRequest request);
 
   // mojom::NetworkService implementation:
-  void HandleViewCacheRequest(const ResourceRequest& request,
-                              mojom::URLLoaderClientPtr client) override;
-
-  std::unique_ptr<service_manager::BinderRegistry> registry_;
+  void CreateNetworkContext(mojom::NetworkContextRequest request,
+                            mojom::NetworkContextParamsPtr params) override;
 
-  NetworkContext context_;
+  std::unique_ptr<MojoNetLog> net_log_;
 
-  // Put it below |context_| so that |context_| outlives all the
-  // NetworkServiceURLLoaderFactoryImpl instances.
-  mojo::StrongBindingSet<mojom::URLLoaderFactory> loader_factory_bindings_;
+  std::unique_ptr<service_manager::BinderRegistry> registry_;
 
-  mojo::BindingSet<mojom::NetworkService> network_service_bindings_;
+  mojo::Binding<mojom::NetworkService> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkService);
 };