Exit VR Shell on pause (And fix a bunch of minor bugs).

chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.cc

 // Copyright 2016 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 "chrome/browser/ui/webui/vr_shell/vr_shell_ui_message_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 24 matching lines @@
   web_ui()->RegisterMessageCallback(
       "doAction", base::Bind(&VrShellUIMessageHandler::HandleDoAction,
                              base::Unretained(this)));
 }
 
 void VrShellUIMessageHandler::HandleDomLoaded(const base::ListValue* args) {
   AllowJavascript();
 }
 
 void VrShellUIMessageHandler::OnJavascriptAllowed() {
-  CHECK(vr_shell_);
+  if (!vr_shell_)

[cjgrant, 2016/10/27 14:33:17]

Why proceed here with no UI?

[mthiesse, 2016/10/27 14:37:03]

This can only happen if vr shell either died, or doesn't exist. If vr shell
died, this webui page will very soon be dead too (there's a destruction race).
If vr shell doesn't exist (the user loaded chrome://vr-shell-ui manually), we
should just silently do nothing.

I ran into this when exiting VR shortly after entering it; we definitely should
crash in that case.

[bshe, 2016/10/27 14:37:11]

I have logged a bug about this here:
https://bugs.chromium.org/p/chromium/issues/detail?id=659707

The root issue is that we didn't try to destroy ui_content before vr_shell is
destroyed. We should fix that I think. And then I think we dont need vr_shell a
weak ptr here.

[mthiesse, 2016/10/27 14:45:55]

Added comment and added bug# to CL.

+    return;
   vr_shell_->GetUiInterface()->SetUiCommandHandler(this);
   vr_shell_->OnDomContentsLoaded();
 }
 
 void VrShellUIMessageHandler::HandleUpdateScene(const base::ListValue* args) {
   if (!vr_shell_)
     return;
 
   // Copy the update instructions and handle them on the render thread.
   auto cb = base::Bind(&vr_shell::UiScene::HandleCommands,
                        base::Unretained(vr_shell_->GetScene()),
                        base::Owned(args->CreateDeepCopy().release()),
                        vr_shell::UiScene::TimeInMicroseconds());
   vr_shell_->QueueTask(cb);
 }
 
 void VrShellUIMessageHandler::HandleDoAction(const base::ListValue* args) {
   int action;
   CHECK(args->GetInteger(0, &action));
   if (vr_shell_) {
     vr_shell_->DoUiAction((vr_shell::UiAction) action);
   }
 }
 
 void VrShellUIMessageHandler::SendCommandToUi(const base::Value& value) {
   CallJavascriptFunction("vrShellUi.command", value);
 }