Remove uses of shell::Loader from content

content/browser/mojo/browser_shell_connection.cc

 // Copyright 2016 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 "content/browser/mojo/browser_shell_connection.h"
 
+#include "base/bind.h"
 #include "content/browser/mojo/constants.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 
 namespace content {
 
+BrowserShellConnection::BrowserShellConnection() {}
+
 BrowserShellConnection::BrowserShellConnection(
     shell::mojom::ShellClientRequest request)
     : shell_connection_(new shell::ShellConnection(this, std::move(request))) {}
 
 BrowserShellConnection::~BrowserShellConnection() {}
 
 shell::Connector* BrowserShellConnection::GetConnector() {
+  DCHECK(shell_connection_);
   return shell_connection_->connector();
 }
 
 void BrowserShellConnection::AddEmbeddedApplication(
     const base::StringPiece& name,
     const EmbeddedApplicationRunner::FactoryCallback& callback,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   std::unique_ptr<EmbeddedApplicationRunner> app(
       new EmbeddedApplicationRunner(callback, task_runner));
+  AddShellClientRequestHandler(
+      name, base::Bind(&EmbeddedApplicationRunner::BindShellClientRequest,
+                       base::Unretained(app.get())));
   auto result = embedded_apps_.insert(
       std::make_pair(name.as_string(), std::move(app)));
   DCHECK(result.second);
 }
 
+void BrowserShellConnection::AddShellClientRequestHandler(
+    const base::StringPiece& name,
+    const ShellClientRequestHandler& handler) {
+  auto result = request_handlers_.insert(
+      std::make_pair(name.as_string(), handler));
+  DCHECK(result.second);
+}
+
 bool BrowserShellConnection::AcceptConnection(shell::Connection* connection) {
   std::string remote_app = connection->GetRemoteIdentity().name();
   if (remote_app == "mojo:shell") {
     // Only expose the SCF interface to the shell.
     connection->AddInterface<shell::mojom::ShellClientFactory>(this);
     return true;
   }
 
   // Allow connections from the root browser application.
   if (remote_app == kBrowserMojoApplicationName &&
       connection->GetRemoteIdentity().user_id() == shell::mojom::kRootUserID)
     return true;
 
   // Reject all other connections to this application.
   return false;
 }
 
 void BrowserShellConnection::Create(
     shell::Connection* connection,
     shell::mojom::ShellClientFactoryRequest request) {
   factory_bindings_.AddBinding(this, std::move(request));
 }
 
 void BrowserShellConnection::CreateShellClient(
     shell::mojom::ShellClientRequest request,
     const mojo::String& name) {
-  auto it = embedded_apps_.find(name);
-  if (it != embedded_apps_.end())
-    it->second->BindShellClientRequest(std::move(request));
+  auto it = request_handlers_.find(name);
+  if (it != request_handlers_.end())
+    it->second.Run(std::move(request));
 }
 
 }  // namespace content