Mark ApplicationImpl::ConnectTo{Application,Service}() as deprecated.

mojo/public/cpp/application/application_impl.h

 // Copyright 2014 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_PUBLIC_CPP_APPLICATION_APPLICATION_IMPL_H_
 #define MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_IMPL_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 45 matching lines @@
   // Returns any initial configuration arguments, passed by the Shell.
   const std::vector<std::string>& args() const { return args_; }
   bool HasArg(const std::string& arg) const;
 
   // Creates a new |ApplicationConnector|. The result can be bound to an
   // |ApplicationConnectorPtr| and used to connect to other applications. (It
   // returns an |InterfaceHandle| instead of an |InterfacePtr| to facilitate
   // passing it to another thread.)
   InterfaceHandle<ApplicationConnector> CreateApplicationConnector();
 
+  // DEPRECATED.
   // Requests a new connection to an application. Returns a pointer to the
   // connection if the connection is permitted by this application's delegate,
   // or nullptr otherwise. Caller does not take ownership. The pointer remains
   // valid until an error occurs on the connection with the Shell, or until the
   // ApplicationImpl is destroyed, whichever occurs first.
   // TODO(vtl): Deprecate/remove this.
-  ApplicationConnection* ConnectToApplication(const String& application_url);
+  ApplicationConnection* ConnectToApplicationDeprecated(
+      const String& application_url);
 
+  // DEPRECATED. (You should probably use something from connect.h instead.)
   // Connect to application identified by |application_url| and connect to the
   // service implementation of the interface identified by |Interface|.
   // TODO(vtl): Deprecate/remove this.
   template <typename Interface>
-  void ConnectToService(const std::string& application_url,
-                        InterfacePtr<Interface>* ptr) {
-    ConnectToApplication(application_url)->ConnectToService(ptr);
+  void ConnectToServiceDeprecated(const std::string& application_url,
+                                  InterfacePtr<Interface>* ptr) {
+    ConnectToApplicationDeprecated(application_url)->ConnectToService(ptr);
   }
 
   // Blocks until the |Application| is initialized (i.e., |Initialize()| is
   // received), if it is not already.
   void WaitForInitialize();
 
   // Unbinds the Shell and Application connections. Can be used to re-bind the
   // handles to another implementation of ApplicationImpl, for instance when
   // running apptests.
   void UnbindConnections(InterfaceRequest<Application>* application_request,
@@ skipping 19 matching lines @@
   ShellPtr shell_;
   std::string url_;
   std::vector<std::string> args_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_APPLICATION_APPLICATION_IMPL_H_