Mandoline: ConnectToApplication and ConnectToService should fail gracefully

components/view_manager/display_manager.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/view_manager/display_manager.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "components/view_manager/display_manager_factory.h"
 #include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/native_viewport/onscreen_context_provider.h"
@@ skipping 101 matching lines @@
       native_viewport::PlatformViewport::Create(this, is_headless_).Pass();
   platform_viewport_->Init(gfx::Rect(metrics_.size_in_pixels.To<gfx::Size>()));
   platform_viewport_->Show();
 
   mojo::ContextProviderPtr context_provider;
   context_provider_->Bind(GetProxy(&context_provider).Pass());
   mojo::DisplayFactoryPtr display_factory;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:surfaces_service");
   app_impl_->ConnectToService(request.Pass(), &display_factory);
+  // TODO(fsamuel): We should indicate to the delegate that this object failed
+  // to initialize.
+  if (!display_factory)
+    return;
   display_factory->Create(context_provider.Pass(),
                           nullptr,  // returner - we never submit resources.
                           GetProxy(&display_));
 }
 
 DefaultDisplayManager::~DefaultDisplayManager() {
   // Destroy before |platform_viewport_| because this will destroy
   // CommandBufferDriver objects that contain child windows. Otherwise if this
   // class destroys its window first, X errors will occur.
   context_provider_.reset();
@@ skipping 28 matching lines @@
   gfx::Rect rect(metrics_.size_in_pixels.To<gfx::Size>());
   auto pass = mojo::CreateDefaultPass(1, rect);
   pass->damage_rect = Rect::From(dirty_rect_);
 
   DrawViewTree(pass.get(), delegate_->GetRootView(), gfx::Vector2d(), 1.0f);
 
   auto frame = mojo::Frame::New();
   frame->passes.push_back(pass.Pass());
   frame->resources.resize(0u);
   frame_pending_ = true;
-  display_->SubmitFrame(
-      frame.Pass(),
-      base::Bind(&DefaultDisplayManager::DidDraw, base::Unretained(this)));
+  if (display_) {
+    display_->SubmitFrame(
+        frame.Pass(),
+        base::Bind(&DefaultDisplayManager::DidDraw, base::Unretained(this)));
+  }
   dirty_rect_ = gfx::Rect();
 }
 
 void DefaultDisplayManager::DidDraw() {
   frame_pending_ = false;
   if (!dirty_rect_.IsEmpty())
     WantToDraw();
 }
 
 void DefaultDisplayManager::WantToDraw() {
@@ skipping 36 matching lines @@
 
   metrics_.size_in_pixels = metrics.size_in_pixels.Clone();
   metrics_.device_pixel_ratio = metrics.device_pixel_ratio;
 }
 
 void DefaultDisplayManager::OnDestroyed() {
   delegate_->OnDisplayClosed();
 }
 
 }  // namespace view_manager