Move more of ContentHandler handling into PackageManager.

mojo/shell/content_handler_connection.h

Index: mojo/shell/content_handler_connection.h
diff --git a/mojo/shell/content_handler_connection.h b/mojo/shell/content_handler_connection.h
deleted file mode 100644
index b71422f44b7897dc4b4680aca0fec2a47d2fff25..0000000000000000000000000000000000000000
--- a/mojo/shell/content_handler_connection.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.
-
-#ifndef MOJO_SHELL_CONTENT_HANDLER_CONNECTION_H_
-#define MOJO_SHELL_CONTENT_HANDLER_CONNECTION_H_
-
-#include <string>
-
-#include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/shell/identity.h"
-#include "url/gurl.h"
-
-namespace mojo {
-namespace shell {
-
-class ApplicationManager;
-class Identity;
-
-// A ContentHandlerConnection is responsible for creating and maintaining a
-// connection to an app which provides the ContentHandler service.
-// A ContentHandlerConnection can only be destroyed via CloseConnection.
-// A ContentHandlerConnection manages its own lifetime and cannot be used with
-// a scoped_ptr to avoid reentrant calls into ApplicationManager late in
-// destruction.
-class ContentHandlerConnection {
- public:
-  // |id| is a unique identifier for this content handler.
-  ContentHandlerConnection(ApplicationManager* manager,
-                           const Identity& source,
-                           const Identity& content_handler,
-                           uint32_t id);
-
-  // Closes the connection and destroys |this| object.
-  void CloseConnection();
-
-  ContentHandler* content_handler() { return content_handler_.get(); }
-  const Identity& identity() const { return identity_; }
-  uint32_t id() const { return id_; }
-
- private:
-  ~ContentHandlerConnection();
-
-  ApplicationManager* manager_;
-  Identity identity_;
-  ContentHandlerPtr content_handler_;
-  bool connection_closed_;
-  // The id for this content handler.
-  const uint32_t id_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentHandlerConnection);
-};
-
-}  // namespace shell
-}  // namespace mojo
-
-#endif  // MOJO_SHELL_CONTENT_HANDLER_CONNECTION_H_