Reland r288013: First cut at "content handling" support in Mojo.

mojo/services/window_manager/window_manager_api_unittest.cc

Index: mojo/services/window_manager/window_manager_api_unittest.cc
diff --git a/mojo/services/window_manager/window_manager_api_unittest.cc b/mojo/services/window_manager/window_manager_api_unittest.cc
index 4450c3b23b5380f389dd284e753bcd03c6e498e4..b557bc955388dbb53700608917b8e93cf6055b21 100644
--- a/mojo/services/window_manager/window_manager_api_unittest.cc
+++ b/mojo/services/window_manager/window_manager_api_unittest.cc
@@ -132,9 +132,12 @@ class TestServiceLoader : public ServiceLoader,
 
  private:
   // Overridden from ServiceLoader:
-  virtual void LoadService(ServiceManager* service_manager,
-                           const GURL& url,
-                           ScopedMessagePipeHandle shell_handle) MOJO_OVERRIDE {
+  virtual void Load(ServiceManager* service_manager,
+                    const GURL& url,
+                    scoped_refptr<LoadCallbacks> callbacks) MOJO_OVERRIDE {
+    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
+    if (!shell_handle.is_valid())
+      return;
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());