Make sure that Content Handled application can be connected multiple times.

mojo/application_manager/application_loader.cc

Index: mojo/application_manager/application_loader.cc
diff --git a/mojo/application_manager/application_loader.cc b/mojo/application_manager/application_loader.cc
index 60dec669d7229d857fd554694d3904b86b9f99a8..ac98b633c0013bb6a75e769c54f9e46c36b679cd 100644
--- a/mojo/application_manager/application_loader.cc
+++ b/mojo/application_manager/application_loader.cc
@@ -4,27 +4,23 @@
 
 #include "mojo/application_manager/application_loader.h"
 
+#include "base/bind.h"
 #include "base/logging.h"
 
 namespace mojo {
 
-ApplicationLoader::SimpleLoadCallbacks::SimpleLoadCallbacks(
-    ScopedMessagePipeHandle shell_handle)
-    : shell_handle_(shell_handle.Pass()) {
-}
+namespace {
 
-ApplicationLoader::SimpleLoadCallbacks::~SimpleLoadCallbacks() {
+void NotReached(const GURL& url,
+                ScopedMessagePipeHandle shell_handle,
+                URLResponsePtr response) {
+  NOTREACHED();
 }
 
-ScopedMessagePipeHandle
-ApplicationLoader::SimpleLoadCallbacks::RegisterApplication() {
-  return shell_handle_.Pass();
-}
+}  // namespace
 
-void ApplicationLoader::SimpleLoadCallbacks::LoadWithContentHandler(
-    const GURL& content_handle_url,
-    URLResponsePtr url_response) {
-  NOTREACHED();
+ApplicationLoader::LoadCallback ApplicationLoader::SimpleLoadCallback() {
+  return base::Bind(&NotReached);
 }
 
 }  // namespace mojo