Eliminate InterfaceRegistry

ios/web/web_state/web_state_impl.h

 // Copyright 2013 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 IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
 #define IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/values.h"
 #import "ios/web/navigation/navigation_manager_delegate.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #import "ios/web/public/java_script_dialog_callback.h"
 #include "ios/web/public/java_script_dialog_type.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_delegate.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "url/gurl.h"
 
 @class CRWSessionStorage;
 @class CRWWebController;
 @protocol CRWWebViewProxy;
 @class NSURLRequest;
 @class NSURLResponse;
 
 namespace net {
 class HttpResponseHeaders;
 }
 
 namespace web {
 
 class BrowserState;
 struct ContextMenuParams;
 struct FaviconURL;
 struct LoadCommittedDetails;
 class NavigationManager;
 class SessionCertificatePolicyCacheImpl;
 class WebInterstitialImpl;
 class WebStatePolicyDecider;
 class WebUIIOS;
 
+class WebStateInterfaceProvider

[Ken Rockot(use gerrit already), 2017/04/28 17:44:02]

Should probably be its own header+mm per the style guide

+    : public service_manager::mojom::InterfaceProvider {
+ public:
+  WebStateInterfaceProvider();
+  ~WebStateInterfaceProvider() override;
+
+  void Bind(service_manager::mojom::InterfaceProviderRequest request);
+
+  service_manager::BinderRegistry* registry() { return &registry_; }
+
+ private:
+  // service_manager::mojom::InterfaceProvider:
+  void GetInterface(const std::string& interface_name,
+                    mojo::ScopedMessagePipeHandle handle) override;
+
+  service_manager::BinderRegistry registry_;
+
+  mojo::Binding<service_manager::mojom::InterfaceProvider> binding_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebStateInterfaceProvider);
+}

[Ken Rockot(use gerrit already), 2017/04/28 17:44:02]

;

+
 // Implementation of WebState.
 // Generally mirrors //content's WebContents implementation.
 // General notes on expected WebStateImpl ownership patterns:
 //  - Outside of tests, WebStateImpls are created
 //      (a) By @Tab, when creating a new Tab.
 //      (b) By @SessionWindow, when decoding a saved session.
 //      (c) By the Copy() method, below, used when marshalling a session
 //          in preparation for saving.
 //  - WebControllers are the eventual long-term owners of WebStateImpls.
 //  - SessionWindows are transient owners, passing ownership into WebControllers
 //    during session restore, and discarding owned copies of WebStateImpls after
 //    writing them out for session saves.
-class WebStateImpl : public WebState, public NavigationManagerDelegate {
+class WebStateImpl : public WebState,
+                     public NavigationManagerDelegate {
  public:
   // Constructor for WebStateImpls created for new sessions.
   WebStateImpl(const CreateParams& params);
   // Constructor for WebStatesImpls created for deserialized sessions
   WebStateImpl(const CreateParams& params, CRWSessionStorage* session_storage);
   ~WebStateImpl() override;
 
   // Gets/Sets the CRWWebController that backs this object.
   CRWWebController* GetWebController();
   void SetWebController(CRWWebController* web_controller);
@@ skipping 130 matching lines @@
   GURL GetCurrentURL(URLVerificationTrustLevel* trust_level) const override;
   void ShowTransientContentView(CRWContentView* content_view) override;
   bool IsShowingWebInterstitial() const override;
   WebInterstitial* GetWebInterstitial() const override;
   void OnPasswordInputShownOnHttp() override;
   void OnCreditCardInputShownOnHttp() override;
   void AddScriptCommandCallback(const ScriptCommandCallback& callback,
                                 const std::string& command_prefix) override;
   void RemoveScriptCommandCallback(const std::string& command_prefix) override;
   id<CRWWebViewProxy> GetWebViewProxy() const override;
-  service_manager::InterfaceRegistry* GetMojoInterfaceRegistry() override;
+  WebStateInterfaceProvider* GetWebStateInterfaceProvider() override;

[Ken Rockot(use gerrit already), 2017/04/28 17:44:02]

need to update WebState too

   bool HasOpener() const override;
   base::WeakPtr<WebState> AsWeakPtr() override;
 
   // Adds |interstitial|'s view to the web controller's content view.
   void ShowWebInterstitial(WebInterstitialImpl* interstitial);
 
   // Called to dismiss the currently-displayed transient content view.
   void ClearTransientContentView();
 
   // Notifies the delegate that the load progress was updated.
@@ skipping 120 matching lines @@
   // Whether this WebState has an opener.  See
   // WebState::CreateParams::created_with_opener_ for more details.
   bool created_with_opener_;
 
   // Member variables should appear before the WeakPtrFactory<> to ensure that
   // any WeakPtrs to WebStateImpl are invalidated before its member variable's
   // destructors are executed, rendering them invalid.
   base::WeakPtrFactory<WebState> weak_factory_;
 
   // Mojo interface registry for this WebState.
-  std::unique_ptr<service_manager::InterfaceRegistry> mojo_interface_registry_;
+  std::unique_ptr<WebStateInterfaceProvider> web_state_interface_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(WebStateImpl);
 };
 
 }  // namespace web
 
 #endif  // IOS_WEB_WEB_STATE_WEB_STATE_IMPL_H_