Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/shell/run.cc

 // Copyright 2013 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 "mojo/shell/run.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/service_manager/service_manager.h"
@@ skipping 18 matching lines @@
   }
 
   for (base::CommandLine::StringVector::const_iterator it = args.begin();
        it != args.end(); ++it) {
     GURL url(*it);
     if (url.scheme() == "mojo" && !command_line.HasSwitch(switches::kOrigin)) {
       LOG(ERROR) << "mojo: url passed with no --origin specified.";
       return;
     }
     ScopedMessagePipeHandle no_handle;
-    context->service_manager()->ConnectToService(GURL(*it), no_handle.Pass());
+    context->service_manager()->Connect(GURL(*it), no_handle.Pass());
   }
 }
 
 }  // namespace shell
 }  // namespace mojo