Add a Javascript wrapper around ServiceRegistry and expose it to WebUI.

content/renderer/web_ui_mojo.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 "content/renderer/web_ui_mojo.h"
 
 #include "content/common/view_messages.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
 #include "content/renderer/web_ui_mojo_context_state.h"
 #include "gin/per_context_data.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 
 namespace content {
@@ skipping 23 matching lines @@
   web_ui_mojo_->DestroyContextState(context);
 }
 
 void WebUIMojo::MainFrameObserver::DidFinishDocumentLoad() {
   web_ui_mojo_->OnDidFinishDocumentLoad();
 }
 
 WebUIMojo::WebUIMojo(RenderView* render_view)
     : RenderViewObserver(render_view),
       RenderViewObserverTracker<WebUIMojo>(render_view),
-      main_frame_observer_(this),
-      did_finish_document_load_(false) {
+      main_frame_observer_(this) {
   CreateContextState();
 }
 
-void WebUIMojo::SetBrowserHandle(mojo::ScopedMessagePipeHandle handle) {
-  if (did_finish_document_load_)
-    SetHandleOnContextState(handle.Pass());
-  else
-    pending_handle_ = handle.Pass();
-}
-
 WebUIMojo::~WebUIMojo() {
 }
 
 void WebUIMojo::CreateContextState() {
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   blink::WebLocalFrame* frame =
       render_view()->GetWebView()->mainFrame()->toWebLocalFrame();
   v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
   gin::PerContextData* context_data = gin::PerContextData::From(context);
   WebUIMojoContextStateData* data = new WebUIMojoContextStateData;
   data->state.reset(new WebUIMojoContextState(
                         render_view()->GetWebView()->mainFrame(), context));
   context_data->SetUserData(kWebUIMojoContextStateKey, data);
 }
 
 void WebUIMojo::DestroyContextState(v8::Handle<v8::Context> context) {
   gin::PerContextData* context_data = gin::PerContextData::From(context);
   if (!context_data)
     return;
   context_data->RemoveUserData(kWebUIMojoContextStateKey);
 }
 
 void WebUIMojo::OnDidFinishDocumentLoad() {
-  did_finish_document_load_ = true;
-  mojo::MessagePipe pipe;
-  SetHandleOnContextState(pipe.handle0.Pass());
-  RenderFrame::FromWebFrame(render_view()->GetWebView()->mainFrame())->
-      GetServiceRegistry()->
-          ConnectToRemoteService("webui_controller", pipe.handle1.Pass());
-}
-
-void WebUIMojo::SetHandleOnContextState(mojo::ScopedMessagePipeHandle handle) {
-  DCHECK(did_finish_document_load_);
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   WebUIMojoContextState* state = GetContextState();
   if (state)
-    state->SetHandle(handle.Pass());
+    state->Run();
 }
 
 WebUIMojoContextState* WebUIMojo::GetContextState() {
   blink::WebLocalFrame* frame =
       render_view()->GetWebView()->mainFrame()->toWebLocalFrame();
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   v8::Handle<v8::Context> context = frame->mainWorldScriptContext();
   gin::PerContextData* context_data = gin::PerContextData::From(context);
   if (!context_data)
     return NULL;
@@ skipping 17 matching lines @@
   WebUIMojoContextState* state = GetContextState();
   if (state && !state->module_added())
     return;
 
   v8::HandleScope handle_scope(blink::mainThreadIsolate());
   DestroyContextState(frame->mainWorldScriptContext());
   CreateContextState();
 }
 
 }  // namespace content