Mozart: Correctly unregister views.

services/ui/view_manager/view_registry.cc

 // Copyright 2015 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 "services/ui/view_manager/view_registry.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 441 matching lines @@
     else if (view_stub->is_pending())
       CHECK(false);  // TODO(jeffbrown): Handle transfer of pending view
   } else {
     UnregisterViewStub(std::move(view_stub));
   }
 }
 
 void ViewRegistry::UnregisterViewStub(std::unique_ptr<ViewStub> view_stub) {
   DCHECK(view_stub);
 
-  if (view_stub->state())
-    UnregisterView(view_stub->state());
+  ViewState* view_state = view_stub->ReleaseView();
+  if (view_state)
+    UnregisterView(view_state);
 }
 
 void ViewRegistry::SetLayout(ViewStub* view_stub,
                              mojo::ui::ViewLayoutParamsPtr layout_params,
                              const ViewLayoutCallback& callback) {
   DCHECK(view_stub);
   DCHECK(AreViewLayoutParamsValid(layout_params.get()));
 
   // Immediately discard layout requests on unavailable views.
   if (view_stub->is_unavailable()) {
@@ skipping 225 matching lines @@
   DCHECK(IsViewTreeStateRegisteredDebug(tree_state));
 
   // TODO: Detect ANRs
   DVLOG(1) << "SendRootUnavailable: tree_state=" << tree_state
            << ", root_key=" << root_key;
   tree_state->view_tree_listener()->OnRootUnavailable(
       root_key, base::Bind(&base::DoNothing));
 }
 
 }  // namespace view_manager