Index: mojo/services/view_manager/view_manager_unittest.cc |
diff --git a/mojo/services/view_manager/view_manager_unittest.cc b/mojo/services/view_manager/view_manager_unittest.cc |
index 5aa37159cc79b248b80d5e10b077bbd5d8fa7882..8a31f3b2169c5f3349944f3379e9616bffd2e179 100644 |
--- a/mojo/services/view_manager/view_manager_unittest.cc |
+++ b/mojo/services/view_manager/view_manager_unittest.cc |
@@ -422,12 +422,11 @@ class EmbedApplicationLoader : public ApplicationLoader, |
// ApplicationLoader implementation: |
void Load(ApplicationManager* manager, |
const GURL& url, |
- scoped_refptr<LoadCallbacks> callbacks) override { |
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication(); |
- if (!shell_handle.is_valid()) |
- return; |
- scoped_ptr<ApplicationImpl> app(new ApplicationImpl(this, |
- shell_handle.Pass())); |
+ ScopedMessagePipeHandle shell_handle, |
+ LoadCallback callbacks) override { |
+ ASSERT_TRUE(shell_handle.is_valid()); |
+ scoped_ptr<ApplicationImpl> app( |
+ new ApplicationImpl(this, shell_handle.Pass())); |
apps_.push_back(app.release()); |
} |
void OnApplicationError(ApplicationManager* manager, |
@@ -517,10 +516,9 @@ class WindowManagerLoader : public ApplicationLoader, |
// ApplicationLoader implementation: |
virtual void Load(ApplicationManager* manager, |
const GURL& url, |
- scoped_refptr<LoadCallbacks> callbacks) override { |
- ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication(); |
- if (!shell_handle.is_valid()) |
- return; |
+ ScopedMessagePipeHandle shell_handle, |
+ LoadCallback callbacks) override { |
+ ASSERT_TRUE(shell_handle.is_valid()); |
scoped_ptr<ApplicationImpl> app( |
new ApplicationImpl(this, shell_handle.Pass())); |
apps_.push_back(app.release()); |