Minor cleanup of view manager

mojo/services/view_manager/view_manager_service_impl.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/view_manager/view_manager_service_impl.h"
 
 #include "base/bind.h"
+#include "base/stl_util.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/services/view_manager/connection_manager.h"
 #include "mojo/services/view_manager/default_access_policy.h"
 #include "mojo/services/view_manager/server_view.h"
 #include "mojo/services/view_manager/window_manager_access_policy.h"
 
 namespace mojo {
 namespace service {
 
 ViewManagerServiceImpl::ViewManagerServiceImpl(
     ConnectionManager* connection_manager,
     ConnectionSpecificId creator_id,
     const std::string& creator_url,
     const std::string& url,
     const ViewId& root_id,
     InterfaceRequest<ServiceProvider> service_provider)
     : connection_manager_(connection_manager),
       id_(connection_manager_->GetAndAdvanceNextConnectionId()),
       url_(url),
       creator_id_(creator_id),
       creator_url_(creator_url),
-      delete_on_connection_error_(false),
       service_provider_(service_provider.Pass()) {
   CHECK(GetView(root_id));
   roots_.insert(ViewIdToTransportId(root_id));
   if (root_id == RootViewId())
     access_policy_.reset(new WindowManagerAccessPolicy(id_, this));
   else
     access_policy_.reset(new DefaultAccessPolicy(id_, this));
 }
 
 ViewManagerServiceImpl::~ViewManagerServiceImpl() {
-  // Delete any views we created.
-  if (!view_map_.empty()) {
-    ConnectionManager::ScopedChange change(this, connection_manager_, true);
-    while (!view_map_.empty())
-      delete view_map_.begin()->second;
-  }
-
-  connection_manager_->RemoveConnection(this);
+  DestroyViews();
 }
 
 const ServerView* ViewManagerServiceImpl::GetView(const ViewId& id) const {
   if (id_ == id.connection_id) {
     ViewMap::const_iterator i = view_map_.find(id.view_id);
     return i == view_map_.end() ? NULL : i->second;
   }
   return connection_manager_->GetView(id);
 }
 
@@ skipping 134 matching lines @@
   } else {
     // View is being shown. View will be drawn if its parent is drawn.
     view_target_drawn_state =
         view->parent() && view->parent()->IsDrawn(connection_manager_->root());
   }
 
   NotifyDrawnStateChanged(view, view_target_drawn_state);
 }
 
 void ViewManagerServiceImpl::OnConnectionError() {
-  if (delete_on_connection_error_)
-    delete this;
+  connection_manager_->OnConnectionError(this);
 }
 
 bool ViewManagerServiceImpl::IsViewKnown(const ServerView* view) const {
   return known_views_.count(ViewIdToTransportId(view->id())) > 0;
 }
 
 bool ViewManagerServiceImpl::CanReorderView(const ServerView* view,
                                             const ServerView* relative_view,
                                             OrderDirection direction) const {
   if (!view || !relative_view)
@@ skipping 138 matching lines @@
     const ServerView* root = GetView(ViewIdFromTransportId(*i));
     DCHECK(root);
     if (view->Contains(root) &&
         (new_drawn_value != root->IsDrawn(connection_manager_->root()))) {
       client()->OnViewDrawnStateChanged(ViewIdToTransportId(root->id()),
                                         new_drawn_value);
     }
   }
 }
 
+void ViewManagerServiceImpl::DestroyViews() {
+  if (!view_map_.empty()) {
+    ConnectionManager::ScopedChange change(this, connection_manager_, true);
+    // If we get here from the destructor we're not going to get
+    // ProcessViewDeleted(). Copy the map and delete from the copy so that we
+    // don't have to worry about whether |view_map_| changes or not.
+    ViewMap view_map_copy;
+    view_map_.swap(view_map_copy);
+    STLDeleteValues(&view_map_copy);
+  }
+}
+
 void ViewManagerServiceImpl::CreateView(
     Id transport_view_id,
     const Callback<void(ErrorCode)>& callback) {
   const ViewId view_id(ViewIdFromTransportId(transport_view_id));
   ErrorCode error_code = ERROR_CODE_NONE;
   if (view_id.connection_id != id_) {
     error_code = ERROR_CODE_ILLEGAL_ARGUMENT;
   } else if (view_map_.find(view_id.view_id) != view_map_.end()) {
     error_code = ERROR_CODE_VALUE_IN_USE;
   } else {
@@ skipping 161 matching lines @@
   if (existing_owner) {
     // Never message the originating connection.
     connection_manager_->OnConnectionMessagedClient(id_);
     existing_owner->RemoveRoot(view_id);
   }
   connection_manager_->EmbedAtView(id_, url, transport_view_id, spir.Pass());
   callback.Run(true);
 }
 
 void ViewManagerServiceImpl::OnConnectionEstablished() {
-  connection_manager_->AddConnection(this);
-
   std::vector<const ServerView*> to_send;
   for (ViewIdSet::const_iterator i = roots_.begin(); i != roots_.end(); ++i)
     GetUnknownViewsFrom(GetView(ViewIdFromTransportId(*i)), &to_send);
 
   client()->OnEmbed(id_,
                     creator_url_,
                     ViewToViewData(to_send.front()),
                     service_provider_.Pass());
 }
 
 const base::hash_set<Id>&
 ViewManagerServiceImpl::GetRootsForAccessPolicy() const {
   return roots_;
 }
 
 bool ViewManagerServiceImpl::IsViewKnownForAccessPolicy(
     const ServerView* view) const {
   return IsViewKnown(view);
 }
 
 bool ViewManagerServiceImpl::IsViewRootOfAnotherConnectionForAccessPolicy(
     const ServerView* view) const {
   ViewManagerServiceImpl* connection =
       connection_manager_->GetConnectionWithRoot(view->id());
   return connection && connection != this;
 }
 
 }  // namespace service
 }  // namespace mojo