Simplify the ApplicationLoader interface in preparation for changes.

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 240 matching lines @@
                    base::Unretained(&application_manager_)));
   }
 
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (command_line->HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
 
   DynamicApplicationLoader* dynamic_application_loader =
       new DynamicApplicationLoader(this, runner_factory.Pass());

[qsr, 2015/02/19 09:25:01]

Maybe:

scoped_ptr<DynamicApplicationLoader> dynamic_application_loader (new
DynamicApplicationLoader(this, runner_factory.Pass()));

and pass it line 263?

[Aaron Boodman, 2015/02/19 20:38:46]

Done.

   InitContentHandlers(dynamic_application_loader, command_line);
-  application_manager_.set_default_loader(
-      scoped_ptr<ApplicationLoader>(dynamic_application_loader));
+  application_manager_.set_dynamic_application_loader(
+      scoped_ptr<DynamicApplicationLoader>(dynamic_application_loader));
 
   ServiceProviderPtr tracing_service_provider_ptr;
   new TracingServiceProvider(GetProxy(&tracing_service_provider_ptr));
   application_manager_.ConnectToApplication(
       GURL("mojo:tracing"), GURL(""), nullptr,
       tracing_service_provider_ptr.Pass());
 
   if (listener_)
     listener_->WaitForListening();
 
@@ skipping 38 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(application_url,
                                                      service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo