Eliminate mojo::Shell client lib class

mash/task_viewer/task_viewer.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 "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/package_manager/public/interfaces/catalog.mojom.h"
 #include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "ui/base/models/table_model.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace task_viewer {
 namespace {
 
 using ListenerRequest =
     mojo::InterfaceRequest<mojo::shell::mojom::ApplicationManagerListener>;
 using mojo::shell::mojom::ApplicationInfoPtr;
 
 class TaskViewerContents
     : public views::WidgetDelegateView,
       public ui::TableModel,
       public views::ButtonListener,
       public mojo::shell::mojom::ApplicationManagerListener {
  public:
   TaskViewerContents(ListenerRequest request,
-                     package_manager::mojom::CatalogPtr catalog,
-                     scoped_ptr<mojo::AppRefCount> app)
+                     package_manager::mojom::CatalogPtr catalog)
       : binding_(this, std::move(request)),
         catalog_(std::move(catalog)),
-        app_(std::move(app)),
         table_view_(nullptr),
         table_view_parent_(nullptr),
         kill_button_(
             new views::LabelButton(this, base::ASCIIToUTF16("Kill Process"))),
         observer_(nullptr),
         weak_ptr_factory_(this) {
     // We don't want to show an empty UI on startup, so just block until we
     // receive the initial set of applications.
     binding_.WaitForIncomingMethodCall();
 
     table_view_ = new views::TableView(this, GetColumns(), views::TEXT_ONLY,
                                        false);
     set_background(views::Background::CreateStandardPanelBackground());
 
     table_view_parent_ = table_view_->CreateParentIfNecessary();
     AddChildView(table_view_parent_);
 
     kill_button_->SetStyle(views::Button::STYLE_BUTTON);
     AddChildView(kill_button_);
   }
   ~TaskViewerContents() override {
     table_view_->SetModel(nullptr);
+    base::MessageLoop::current()->QuitWhenIdle();
   }
 
  private:
   struct InstanceInfo {
     InstanceInfo(uint32_t id,
                  const std::string& url,
                  base::ProcessId pid)
         : id(id), url(url), pid(pid) {}
     uint32_t id;
     std::string url;
@@ skipping 157 matching lines @@
     pid_column.title  = base::ASCIIToUTF16("PID");
     pid_column.width = 50;
     pid_column.sortable = true;
     columns.push_back(pid_column);
 
     return columns;
   }
 
   mojo::Binding<mojo::shell::mojom::ApplicationManagerListener> binding_;
   package_manager::mojom::CatalogPtr catalog_;
-  scoped_ptr<mojo::AppRefCount> app_;
 
   views::TableView* table_view_;
   views::View* table_view_parent_;
   views::LabelButton* kill_button_;
   ui::TableModelObserver* observer_;
 
   std::vector<scoped_ptr<InstanceInfo>> instances_;
 
   base::WeakPtrFactory<TaskViewerContents> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskViewerContents);
 };
 
 }  // namespace
 
 TaskViewer::TaskViewer() {}
 TaskViewer::~TaskViewer() {}
 
-void TaskViewer::Initialize(mojo::Shell* shell, const std::string& url,
+void TaskViewer::Initialize(mojo::Connector* connector,
+                            const std::string& url,
                             uint32_t id, uint32_t user_id) {
-  tracing_.Initialize(shell, url);
+  tracing_.Initialize(connector, url);
 
-  aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
-  views::WindowManagerConnection::Create(shell);
+  aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+  views::WindowManagerConnection::Create(connector);
 
   mojo::shell::mojom::ApplicationManagerPtr application_manager;
-  shell->ConnectToInterface("mojo:shell", &application_manager);
+  connector->ConnectToInterface("mojo:shell", &application_manager);
 
   mojo::shell::mojom::ApplicationManagerListenerPtr listener;
   ListenerRequest request = GetProxy(&listener);
   application_manager->AddListener(std::move(listener));
 
   package_manager::mojom::CatalogPtr catalog;
-  shell->ConnectToInterface("mojo:package_manager", &catalog);
+  connector->ConnectToInterface("mojo:package_manager", &catalog);
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
-      std::move(request), std::move(catalog), shell->CreateAppRefCount());
+      std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       task_viewer, gfx::Rect(10, 10, 500, 500));
   window->Show();
 }
 
 }  // namespace task_viewer
 }  // namespace main