Removes ServiceProviders from ViewManager::Embed

components/html_viewer/html_document.cc

 // Copyright 2014 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.
 
 #include "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 133 matching lines @@
 }  // namespace
 
 HTMLDocument::HTMLDocument(mojo::ApplicationImpl* html_document_app,
                            mojo::ApplicationConnection* connection,
                            URLResponsePtr response,
                            Setup* setup)
     : app_refcount_(
           html_document_app->app_lifetime_helper()->CreateAppRefCount()),
       html_document_app_(html_document_app),
       response_(response.Pass()),
+      navigator_host_(connection->GetServiceProvider()),
       web_view_(nullptr),
       root_(nullptr),
       view_manager_client_factory_(html_document_app->shell(), this),
       setup_(setup),
       frame_tree_manager_binding_(&frame_tree_manager_) {
-  embedder_exported_services_.AddService(
+  connection->AddService(
       static_cast<mojo::InterfaceFactory<mandoline::FrameTreeClient>*>(this));
-
   connection->AddService(
       static_cast<InterfaceFactory<mojo::AxProvider>*>(this));
   connection->AddService(&view_manager_client_factory_);
 
   if (setup_->did_init())
     Load(response_.Pass());
 }
 
 HTMLDocument::~HTMLDocument() {
   STLDeleteElements(&ax_providers_);
   STLDeleteElements(&ax_provider_requests_);
 
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
-void HTMLDocument::OnEmbed(
-    View* root,
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
-    mojo::ServiceProviderPtr exposed_services) {
+void HTMLDocument::OnEmbed(View* root) {
   DCHECK(!setup_->is_headless());
   root_ = root;
   root_->AddObserver(this);
-  embedder_service_provider_ = exposed_services.Pass();
-  navigator_host_.set_service_provider(embedder_service_provider_.get());
-
-  embedder_exported_services_.Bind(services.Pass());
 
   InitSetupAndLoadIfNecessary();
 }
 
 void HTMLDocument::OnViewManagerDestroyed(ViewManager* view_manager) {
   delete this;
 }
 
 void HTMLDocument::Create(mojo::ApplicationConnection* connection,
                           mojo::InterfaceRequest<AxProvider> request) {
@@ skipping 144 matching lines @@
   // Either it should, as it once did, or we should find another solution here.
   return blink::Platform::current()->cookieJar();
 }
 
 blink::WebNavigationPolicy HTMLDocument::decidePolicyForNavigation(
     const NavigationPolicyInfo& info) {
   std::string frame_name = info.frame ? info.frame->assignedName().utf8() : "";
   if (info.frame->parent() && EnableOOPIFs()) {
     mojo::View* view = frame_to_view_[info.frame].view;
     mojo::URLRequestPtr url_request = mojo::URLRequest::From(info.urlRequest);
-    view->Embed(url_request.Pass(), nullptr, nullptr);
+    view->EmbedAllowingReembed(url_request.Pass());
     // TODO(sky): I tried swapping the frame types here, but that resulted in
     // the view never getting sized. Figure out why.
     // TODO(sky): there are timing conditions here, and we should only do this
     // once.
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&HTMLDocument::ConvertLocalFrameToRemoteFrame,
                               base::Unretained(this), info.frame));
     return blink::WebNavigationPolicyIgnore;
   }
 
@@ skipping 76 matching lines @@
     touch_handler_->OnTouchEvent(*event);
     return;
   }
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer