| Index: mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| diff --git a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| index 2e0b8a52a789e6a6805194abae68f52d3998fe17..6b1bdd37a7131056b06124989052668c397e134a 100644
|
| --- a/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| +++ b/mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc
|
| @@ -53,9 +53,12 @@ class ConnectServiceLoader : public ServiceLoader,
|
|
|
| private:
|
| // Overridden from ServiceLoader:
|
| - virtual void LoadService(ServiceManager* manager,
|
| - const GURL& url,
|
| - ScopedMessagePipeHandle shell_handle) OVERRIDE {
|
| + virtual void Load(ServiceManager* 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()));
|
| apps_.push_back(app.release());
|
|
|