Eliminate mojo::Shell client lib class

content/public/test/test_mojo_app.cc

Index: content/public/test/test_mojo_app.cc
diff --git a/content/public/test/test_mojo_app.cc b/content/public/test/test_mojo_app.cc
index cc8017506bb16aed88dbc396ec086b7f16a2cf22..4fb1b271d4479272f9b91bee70cffdc2ab409373 100644
--- a/content/public/test/test_mojo_app.cc
+++ b/content/public/test/test_mojo_app.cc
@@ -7,24 +7,20 @@
 #include <utility>
 
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "mojo/shell/public/cpp/connection.h"
-#include "mojo/shell/public/cpp/shell.h"
+#include "mojo/shell/public/cpp/connector.h"
 
 namespace content {
 
 const char kTestMojoAppUrl[] = "system:content_mojo_test";
 
-TestMojoApp::TestMojoApp() : service_binding_(this), shell_(nullptr) {
+TestMojoApp::TestMojoApp() : service_binding_(this) {
 }
 
 TestMojoApp::~TestMojoApp() {
 }
 
-void TestMojoApp::Initialize(mojo::Shell* shell, const std::string& url,
-                             uint32_t id, uint32_t user_id) {
-  shell_ = shell;
-}
-
 bool TestMojoApp::AcceptConnection(mojo::Connection* connection) {
   requestor_url_ = GURL(connection->GetRemoteApplicationURL());
   connection->AddInterface<TestMojoService>(this);
@@ -39,8 +35,7 @@ void TestMojoApp::Create(mojo::Connection* connection,
 
 void TestMojoApp::DoSomething(const DoSomethingCallback& callback) {
   callback.Run();
-  DCHECK(shell_);
-  shell_->Quit();
+  base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void TestMojoApp::GetRequestorURL(const GetRequestorURLCallback& callback) {