Move ownership of the AppListViewDelegate into the AppListService

ui/app_list/demo/app_list_demo_views.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
@@ skipping 43 matching lines @@
 app_list::AppListView* DemoAppListViewDelegate::InitView(
     gfx::NativeWindow window_context) {
   gfx::NativeView container = NULL;
   // On Ash, the app list is placed into an aura::Window container. For the demo
   // use the root window context as the parent. This only works on Aura since an
   // aura::Window is also a NativeView.
 #if defined(USE_AURA)
   container = window_context;
 #endif
 
-  // Note AppListView takes ownership of |this| on the next line.
   view_ = new app_list::AppListView(this);
   view_->InitAsBubbleAtFixedLocation(container,
                                      0,
                                      gfx::Point(300, 300),
                                      views::BubbleBorder::FLOAT,
                                      false /* border_accepts_events */);
 
   // Populate some apps.
   GetTestModel()->PopulateApps(kInitialItems);
   app_list::AppListItemList* item_list = GetTestModel()->top_level_item_list();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   gfx::Image test_image = rb.GetImageNamed(IDR_DEFAULT_FAVICON_32);
   for (size_t i = 0; i < item_list->item_count(); ++i) {
     app_list::AppListItem* item = item_list->item_at(i);
     // Alternate images with shadows and images without.
     item->SetIcon(*test_image.ToImageSkia(), i & 1);
   }
   return view_;
 }
 
 void DemoAppListViewDelegate::Dismiss() {
   view_->GetWidget()->Close();
 }
 
 void DemoAppListViewDelegate::ViewClosing() {
-  web_contents_.reset();
-  view_ = NULL;
-  base::MessageLoopForUI::current()->Quit();
+  base::MessageLoop* message_loop = base::MessageLoopForUI::current();
+  message_loop->DeleteSoon(FROM_HERE, this);
+  message_loop->QuitWhenIdle();
 }
 
 views::View* DemoAppListViewDelegate::CreateStartPageWebView(
     const gfx::Size& size) {
   web_contents_.reset(content::WebContents::Create(
       content::WebContents::CreateParams(browser_context_)));
   web_contents_->GetController().LoadURL(GURL("http://www.google.com/"),
                                          content::Referrer(),
                                          content::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                          std::string());
@@ skipping 21 matching lines @@
   content::InitializeSandboxInfo(&sandbox_info);
   ui::ViewsContentClient views_content_client(instance, &sandbox_info);
 #else
 int main(int argc, const char** argv) {
   ui::ViewsContentClient views_content_client(argc, argv);
 #endif
 
   views_content_client.set_task(base::Bind(&ShowAppList));
   return views_content_client.RunMain();
 }