Revert of Some more minor cleanup to ApplicationManager.

mojo/shell/connect_util.h

-// 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_CONNECT_UTIL_H_
-#define MOJO_SHELL_CONNECT_UTIL_H_
-
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr.h"
-#include "third_party/mojo/src/mojo/public/cpp/system/handle.h"
-
-class GURL;
-
-namespace mojo {
-namespace shell {
-
-class ApplicationManager;
-
-ScopedMessagePipeHandle ConnectToServiceByName(
-    ApplicationManager* application_manager,
-    const GURL& application_url,
-    const std::string& interface_name);
-
-// Must only be used by shell internals and test code as it does not forward
-// capability filters.
-template <typename Interface>
-inline void ConnectToService(ApplicationManager* application_manager,
-                             const GURL& application_url,
-                             InterfacePtr<Interface>* ptr) {
-  ScopedMessagePipeHandle service_handle =
-      ConnectToServiceByName(application_manager, application_url,
-                             Interface::Name_);
-  ptr->Bind(InterfacePtrInfo<Interface>(service_handle.Pass(), 0u));
-}
-
-}  // namespace shell
-}  // namespace mojo
-
-
-#endif  // MOJO_SHELL_CONNECT_UTIL_H_