Remove [Client=] annotation from ServiceProvider

mojo/public/cpp/application/application_connection.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_APPLICATION_APPLICATION_CONNECTION_H_
 #define MOJO_PUBLIC_APPLICATION_APPLICATION_CONNECTION_H_
 
 #include <string>
 
 #include "mojo/public/cpp/application/lib/service_connector.h"
@@ skipping 29 matching lines @@
 
   template <typename Interface>
   void AddService(InterfaceFactory<Interface>* factory) {
     AddServiceConnector(
         new internal::InterfaceFactoryConnector<Interface>(factory));
   }
 
   // Connect to the service implementing |Interface|.
   template <typename Interface>
   void ConnectToService(InterfacePtr<Interface>* ptr) {
-    MessagePipe pipe;
-    ptr->Bind(pipe.handle0.Pass());
-    GetServiceProvider()->ConnectToService(Interface::Name_,
-                                           pipe.handle1.Pass());
+    if (ServiceProvider* sp = GetServiceProvider()) {
+      MessagePipe pipe;
+      ptr->Bind(pipe.handle0.Pass());
+      sp->ConnectToService(Interface::Name_, pipe.handle1.Pass());
+    }
   }
 
   // The url identifying the application on the other end of this connection.
   virtual const std::string& GetRemoteApplicationURL() = 0;
 
   // Establishes a new connection to an application.
   // TODO(davemoore): Would it be better to expose the ApplicationImpl?
   virtual ApplicationConnection* ConnectToApplication(
       const std::string& url) = 0;
 
   // Connect to application identified by |application_url| and connect to
   // the service implementation of the interface identified by |Interface|.
   template <typename Interface>
   void ConnectToService(const std::string& application_url,
                         InterfacePtr<Interface>* ptr) {
     ConnectToApplication(application_url)->ConnectToService(ptr);
   }
 
   // Raw ServiceProvider interface to remote application.
   virtual ServiceProvider* GetServiceProvider() = 0;
 
  private:
   virtual void AddServiceConnector(
       internal::ServiceConnectorBase* service_connector) = 0;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_APPLICATION_CONNECTION_H_