Shutdown cleanup

mojo/services/native_viewport/native_viewport_service.cc

 // Copyright 2013 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/native_viewport/native_viewport_service.h"
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
@@ skipping 119 matching lines @@
     widget_ = widget;
     CreateCommandBufferIfNeeded();
   }
 
   virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE {
     CreateCommandBufferIfNeeded();
     client()->OnBoundsChanged(Rect::From(bounds));
   }
 
   virtual void OnDestroyed() OVERRIDE {
-    command_buffer_.reset();
-    client()->OnDestroyed();
-    base::MessageLoop::current()->Quit();
+    client()->OnDestroyed(base::Bind(&NativeViewportImpl::AckDestroyed,
+                                     base::Unretained(this)));
   }
 
  private:
+  void AckDestroyed() {
+    command_buffer_.reset();
+  }
+
   shell::Context* context_;
   gfx::AcceleratedWidget widget_;
   scoped_ptr<services::NativeViewport> native_viewport_;
   InterfaceRequest<CommandBuffer> command_buffer_request_;
   scoped_ptr<CommandBufferImpl> command_buffer_;
   bool waiting_for_event_ack_;
   base::WeakPtrFactory<NativeViewportImpl> weak_factory_;
 };
 
 class NVSDelegate : public ApplicationDelegate {
@@ skipping 15 matching lines @@
 }  // namespace mojo
 
 MOJO_NATIVE_VIEWPORT_EXPORT mojo::ApplicationImpl*
     CreateNativeViewportService(
         mojo::shell::Context* context,
         mojo::ScopedMessagePipeHandle service_provider_handle) {
   mojo::ApplicationImpl* app = new mojo::ApplicationImpl(
       new mojo::services::NVSDelegate(context), service_provider_handle.Pass());
   return app;
 }