Mojo HTML viewer crash

mojo/services/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 "mojo/services/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 222 matching lines @@
 blink::WebNavigationPolicy HTMLDocument::decidePolicyForNavigation(
     blink::WebLocalFrame* frame,
     blink::WebDataSource::ExtraData* data,
     const blink::WebURLRequest& request,
     blink::WebNavigationType nav_type,
     blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
   if (CanNavigateLocally(frame, request))
     return default_policy;
 
-  navigator_host_->RequestNavigate(
-      WebNavigationPolicyToNavigationTarget(default_policy),
-      mojo::URLRequest::From(request).Pass());
+  if (embedder_service_provider_.get())

[DaveMoore, 2014/12/19 23:56:13]

nit: There should be braces around this.

[Aaron Boodman, 2014/12/20 17:46:07]

Modify LazyInterfacePtr so that you can do navigator_host_.get(). It should
first test whether service_provider_ is set, and if not, return false before
doing anything else.

[dtapuska, 2015/01/05 18:41:24]

Done.

+    navigator_host_->RequestNavigate(
+        WebNavigationPolicyToNavigationTarget(default_policy),
+        mojo::URLRequest::From(request).Pass());
 
   return blink::WebNavigationPolicyIgnore;
 }
 
 void HTMLDocument::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
 }
 
 void HTMLDocument::didNavigateWithinPage(
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
-  navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
+  if (embedder_service_provider_.get())
+    navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
 }
 
 void HTMLDocument::OnViewBoundsChanged(View* view,
                                        const Rect& old_bounds,
                                        const Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   web_view_->resize(
       blink::WebSize(view->bounds().width, view->bounds().height));
 }
 
 void HTMLDocument::OnViewDestroyed(View* view) {
   DCHECK_EQ(view, root_);
   root_ = nullptr;
 }
 
 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer