Add creation of ServiceManager to Content (2nd try)

mojo/shell/dynamic_service_loader.cc

 // 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.
 
 #include "mojo/shell/dynamic_service_loader.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/keep_alive.h"
@@ skipping 87 matching lines @@
 }
 
 void DynamicServiceLoader::LoadService(ServiceManager* manager,
                                        const GURL& url,
                                        ScopedShellHandle service_handle) {
   DCHECK(url_to_load_context_.find(url) == url_to_load_context_.end());
   url_to_load_context_[url] = new LoadContext(
       this, url, service_handle.Pass(), runner_factory_->Create(context_));
 }
 
+void DynamicServiceLoader::OnServiceError(ServiceManager* manager,
+                                          const GURL& url) {
+}
+
 void DynamicServiceLoader::AppCompleted(const GURL& url) {
   DCHECK(context_->task_runners()->ui_runner()->BelongsToCurrentThread());
   DVLOG(2) << "App completed (url: " << url << ")";
 
   LoadContextMap::iterator it = url_to_load_context_.find(url);
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo