Makes DocumentView not assume it's getting services from the embedder

sky/viewer/document_view.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 "sky/viewer/document_view.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 115 matching lines @@
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void DocumentView::OnEmbed(
     mojo::View* root,
     mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder,
     mojo::ServiceProviderPtr services_provided_by_embedder) {
   root_ = root;
 
-  mojo::ConnectToService(services_provided_by_embedder.get(), &navigator_host_);
-  if (RuntimeFlags::Get().testing())
-    mojo::ConnectToService(services_provided_by_embedder.get(), &test_harness_);
+  if (services_provided_by_embedder.get()) {
+    mojo::ConnectToService(services_provided_by_embedder.get(),
+                           &navigator_host_);
+    if (RuntimeFlags::Get().testing())
+      mojo::ConnectToService(services_provided_by_embedder.get(),
+                             &test_harness_);
+  }
 
   services_provided_to_embedder_ = services_provided_to_embedder.Pass();
   services_provided_by_embedder_ = services_provided_by_embedder.Pass();
 
   Load(response_.Pass());
 
   UpdateRootSizeAndViewportMetrics(root_->bounds());
 
   // TODO(abarth): We should ask the view whether it is focused instead of
   // assuming that we're focused.
@@ skipping 112 matching lines @@
 
 float DocumentView::GetDevicePixelRatio() const {
   if (root_)
     return root_->viewport_metrics().device_pixel_ratio;
   return 1.f;
 }
 
 blink::WebNavigationPolicy DocumentView::decidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) {
 
-  navigator_host_->RequestNavigate(
-      WebNavigationPolicyToNavigationTarget(info.defaultPolicy),
-      mojo::URLRequest::From(info.urlRequest).Pass());
+  if (navigator_host_.get()) {
+    navigator_host_->RequestNavigate(
+        WebNavigationPolicyToNavigationTarget(info.defaultPolicy),
+        mojo::URLRequest::From(info.urlRequest).Pass());
+  }
 
   return blink::WebNavigationPolicyIgnore;
 }
 
 void DocumentView::didAddMessageToConsole(
     const blink::WebConsoleMessage& message,
     const blink::WebString& source_name,
     unsigned source_line,
     const blink::WebString& stack_trace) {
 }
@@ skipping 89 matching lines @@
   interface_names[0] = mojo::ViewManagerClient::Name_;
   mojo::ServiceProviderImpl* sp_impl(new mojo::ServiceProviderImpl());
   sp_impl->AddService(&view_manager_client_factory_);
   mojo::ServiceProviderPtr sp;
   service_registry_service_provider_binding_.reset(
       new mojo::StrongBinding<mojo::ServiceProvider>(sp_impl, &sp));
   service_registry_->AddServices(interface_names.Pass(), sp.Pass());
 }
 
 }  // namespace sky