Neuter the wrong-way ServiceProvider (a.k.a. exposed_services).

shell/context.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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 293 matching lines @@
   // The mojo_shell --args-for command-line switch is handled specially because
   // it can appear more than once. The base::CommandLine class collapses
   // multiple occurrences of the same switch.
   base::CommandLine* current = base::CommandLine::ForCurrentProcess();
   for (size_t i = 1; i < current->argv().size(); ++i)
     ApplyApplicationArgs(this, current->argv()[i]);
 
   ServiceProviderPtr tracing_services;
   application_manager_.ConnectToApplication(GURL("mojo:tracing"), GURL(""),
                                             GetProxy(&tracing_services),
-                                            nullptr, base::Closure());
+                                            base::Closure());
   if (tracer_) {
     tracing::TraceProviderRegistryPtr registry;
     mojo::ConnectToService(tracing_services.get(), GetProxy(&registry));
 
     mojo::InterfaceHandle<tracing::TraceProvider> provider;
     tracer_->ConnectToProvider(GetProxy(&provider));
     registry->RegisterTraceProvider(provider.Pass());
   }
 
   if (command_line.HasSwitch(switches::kTraceStartup)) {
@@ skipping 26 matching lines @@
   DCHECK(task_runners_->shell_runner()->RunsTasksOnCurrentThread());
   base::MessageLoop::current()->Quit();
 }
 
 void Context::OnSlaveDisconnect(mojo::embedder::SlaveInfo slave_info) {
   // TODO(vtl): Do something, once we actually have |slave_info|.
 }
 
 void Context::Run(const GURL& url) {
   ServiceProviderPtr services;
-  ServiceProviderPtr exposed_services;
 
   app_urls_.insert(url);
   application_manager_.ConnectToApplication(
-      url, GURL(), mojo::GetProxy(&services), exposed_services.Pass(),
+      url, GURL(), mojo::GetProxy(&services),
       base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
 }
 
 void Context::OnApplicationEnd(const GURL& url) {
   if (app_urls_.find(url) != app_urls_.end()) {
     app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK(task_runners_->shell_runner()->RunsTasksOnCurrentThread());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell